You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/07/07 15:43:01 UTC
[01/10] airavata git commit: creating new branch for grouper
integration
Repository: airavata
Updated Branches:
refs/heads/grouper-integration [created] 70f857953
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 5dad27e..4efd940 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -41,6 +41,7 @@ include "../data-models/resource-catalog-models/gateway_resource_profile_model.t
include "../data-models/resource-catalog-models/data_movement_models.thrift"
include "../data-models/workflow-models/workflow_data_model.thrift"
include "../data-models/replica-catalog-models/replica_catalog_models.thrift"
+include "../data-models/user-group-models/group_manager_model.thrift"
namespace java org.apache.airavata.api
namespace php Airavata.API
@@ -2871,6 +2872,31 @@ service Airavata {
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
+
+ /**
+ * Group Manager and Data Sharing Related API methods
+ **/
+ bool shareResourceWithUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ 4: map<string, group_manager_model.ResourcePermissionType> userPermissionList)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.AiravataClientException ace,
+ 3: airavata_errors.AiravataSystemException ase,
+ 4: airavata_errors.AuthorizationException ae)
+
+ bool revokeSharingOfResourceFromUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ 4: map<string, group_manager_model.ResourcePermissionType> userPermissionList)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.AiravataClientException ace,
+ 3: airavata_errors.AiravataSystemException ase,
+ 4: airavata_errors.AuthorizationException ae)
+
+ list<string> getAllAccessibleUsers(1: required security_model.AuthzToken authzToken, 2: required string resourceId, 3: required group_manager_model.ResourceType resourceType,
+ 4: required group_manager_model.ResourcePermissionType permissionType)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.AiravataClientException ace,
+ 3: airavata_errors.AiravataSystemException ase,
+ 4: airavata_errors.AuthorizationException ae)
+
//End of API
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/thrift-interface-descriptions/data-models/airavata_data_models.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/airavata_data_models.thrift b/thrift-interface-descriptions/data-models/airavata_data_models.thrift
index 6eae503..b67614f 100644
--- a/thrift-interface-descriptions/data-models/airavata_data_models.thrift
+++ b/thrift-interface-descriptions/data-models/airavata_data_models.thrift
@@ -32,6 +32,7 @@ include "experiment-catalog-models/status_models.thrift"
include "resource-catalog-models/data_movement_models.thrift"
include "replica-catalog-models/replica_catalog_models.thrift"
include "user-group-models/user_profile_model.thrift"
+include "user-group-models/group_manager_model.thrift"
namespace java org.apache.airavata.model
namespace php Airavata.Model
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
index f2532dd..e214d39 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift
@@ -43,16 +43,21 @@ struct Group {
struct Project {
1: required string projectID = airavata_commons.DEFAULT_ID,
2: required string owner,
- 3: required string name,
- 4: optional string description
- 5: optional i64 creationTime
- 6: optional list<string> sharedUsers,
- 7: optional list<string> sharedGroups
+ 3: required string gatewayId,
+ 4: required string name,
+ 5: optional string description
+ 6: optional i64 creationTime
+ 7: optional list<string> sharedUsers,
+ 8: optional list<string> sharedGroups
}
struct User {
- 1: required string userName,
- 2: optional list<Group> groupList
+ 1: required string airavataInternalUserId = airavata_commons.DEFAULT_ID,
+ 2: optional string userName,
+ 3: required string gatewayId,
+ 4: optional string firstName,
+ 5: optional string lastName,
+ 6: optional string email
}
struct Gateway {
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
index 9a82c60..547020e 100644
--- a/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-group-models/group_manager_model.thrift
@@ -25,8 +25,6 @@
namespace cpp apache.airavata.model.group
namespace py apache.airavata.model.group
-const string GROUP_MANAGER_VERSION = "1.0"
-
enum ResourceType {
PROJECT,
@@ -36,53 +34,6 @@ enum ResourceType {
}
enum ResourcePermissionType {
- READ_WRITE,
- READ_ONLY
-}
-
-struct Resource {
- 1: required string resourceId = airavata_commons.DEFAULT_ID,
- 2: required string resourceName,
- 3: required ResourceType resourceType,
- 4: required string ownerId,
- 5: optional string resourceDescription,
- 6: optional i64 createdTime,
- 8: optional string parentResourceId,
- 9: optional list<Resource> childResources,
- 10: optional map<string,string> metadata
-}
-
-struct Group{
- 1: required string groupId = airavata_commons.DEFAULT_ID,
- 2: required string groupId,
- 3: required string groupName,
- 4: optional string description,
- 5: optional list<User> users,
- 6: optional list<Group> subGroups,
- 7: optional map<string,string> metadata
-}
-
-struct User {
- 1: required string airavataInternalUserId,
- 2: required string userId,
- 3: optional map<string,string> metadata
-}
-
-enum SubjectType {
- USER,
- GROUP
-}
-
-enum GroupMembershipType {
- DIRECT,
- INDIRECT
-}
-
-struct GroupMembership{
- 1: required string groupId,
- 2: required string childId,
- 3: required SubjectType childSubjectType,
- 4: required string parentSubjectName,
- 5: required string childSubjectName,
- 6: required GroupMembershipType groupMembershipType
+ WRITE,
+ READ
}
\ No newline at end of file
[09/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/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 eb378eb..06570d1 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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Airavata {
public interface Iface {
@@ -2509,6 +2509,21 @@ public class Airavata {
public List<org.apache.airavata.model.data.replica.DataProductModel> getChildDataProducts(org.apache.airavata.model.security.AuthzToken authzToken, String productUri) 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;
+ /**
+ * Group Manager and Data Sharing Related API methods
+ *
+ *
+ * @param authzToken
+ * @param resourceId
+ * @param resourceType
+ * @param userPermissionList
+ */
+ public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) 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 revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) 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 List<String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) 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 interface AsyncIface {
@@ -2795,6 +2810,12 @@ public class Airavata {
public void getChildDataProducts(org.apache.airavata.model.security.AuthzToken authzToken, String productUri, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
+ public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
+ public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
}
public static class Client extends org.apache.thrift.TServiceClient implements Iface {
@@ -7971,6 +7992,120 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getChildDataProducts failed: unknown result");
}
+ public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) 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_shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList);
+ return recv_shareResourceWithUsers();
+ }
+
+ public void send_shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
+ {
+ shareResourceWithUsers_args args = new shareResourceWithUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setUserPermissionList(userPermissionList);
+ sendBase("shareResourceWithUsers", args);
+ }
+
+ public boolean recv_shareResourceWithUsers() 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
+ {
+ shareResourceWithUsers_result result = new shareResourceWithUsers_result();
+ receiveBase(result, "shareResourceWithUsers");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "shareResourceWithUsers failed: unknown result");
+ }
+
+ public boolean revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) 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_revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList);
+ return recv_revokeSharingOfResourceFromUsers();
+ }
+
+ public void send_revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
+ {
+ revokeSharingOfResourceFromUsers_args args = new revokeSharingOfResourceFromUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setUserPermissionList(userPermissionList);
+ sendBase("revokeSharingOfResourceFromUsers", args);
+ }
+
+ public boolean recv_revokeSharingOfResourceFromUsers() 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
+ {
+ revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
+ receiveBase(result, "revokeSharingOfResourceFromUsers");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromUsers failed: unknown result");
+ }
+
+ public List<String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) 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_getAllAccessibleUsers(authzToken, resourceId, resourceType, permissionType);
+ return recv_getAllAccessibleUsers();
+ }
+
+ public void send_getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException
+ {
+ getAllAccessibleUsers_args args = new getAllAccessibleUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setPermissionType(permissionType);
+ sendBase("getAllAccessibleUsers", args);
+ }
+
+ public List<String> recv_getAllAccessibleUsers() 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
+ {
+ getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
+ receiveBase(result, "getAllAccessibleUsers");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result");
+ }
+
}
public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
@@ -13212,6 +13347,129 @@ public class Airavata {
}
}
+ public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ shareResourceWithUsers_call method_call = new shareResourceWithUsers_call(authzToken, resourceId, resourceType, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class shareResourceWithUsers_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
+ private String resourceId;
+ private org.apache.airavata.model.group.ResourceType resourceType;
+ private Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList;
+ public shareResourceWithUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, 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.resourceId = resourceId;
+ this.resourceType = resourceType;
+ this.userPermissionList = userPermissionList;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("shareResourceWithUsers", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ shareResourceWithUsers_args args = new shareResourceWithUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setUserPermissionList(userPermissionList);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public boolean getResult() 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 {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_shareResourceWithUsers();
+ }
+ }
+
+ public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ revokeSharingOfResourceFromUsers_call method_call = new revokeSharingOfResourceFromUsers_call(authzToken, resourceId, resourceType, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class revokeSharingOfResourceFromUsers_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
+ private String resourceId;
+ private org.apache.airavata.model.group.ResourceType resourceType;
+ private Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList;
+ public revokeSharingOfResourceFromUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, Map<String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, 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.resourceId = resourceId;
+ this.resourceType = resourceType;
+ this.userPermissionList = userPermissionList;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("revokeSharingOfResourceFromUsers", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ revokeSharingOfResourceFromUsers_args args = new revokeSharingOfResourceFromUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setUserPermissionList(userPermissionList);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public boolean getResult() 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 {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_revokeSharingOfResourceFromUsers();
+ }
+ }
+
+ public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ getAllAccessibleUsers_call method_call = new getAllAccessibleUsers_call(authzToken, resourceId, resourceType, permissionType, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class getAllAccessibleUsers_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
+ private String resourceId;
+ private org.apache.airavata.model.group.ResourceType resourceType;
+ private org.apache.airavata.model.group.ResourcePermissionType permissionType;
+ public getAllAccessibleUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, 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.resourceId = resourceId;
+ this.resourceType = resourceType;
+ this.permissionType = permissionType;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllAccessibleUsers", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getAllAccessibleUsers_args args = new getAllAccessibleUsers_args();
+ args.setAuthzToken(authzToken);
+ args.setResourceId(resourceId);
+ args.setResourceType(resourceType);
+ args.setPermissionType(permissionType);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public List<String> getResult() 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 {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_getAllAccessibleUsers();
+ }
+ }
+
}
public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
@@ -13366,6 +13624,9 @@ public class Airavata {
processMap.put("registerReplicaLocation", new registerReplicaLocation());
processMap.put("getParentDataProduct", new getParentDataProduct());
processMap.put("getChildDataProducts", new getChildDataProducts());
+ processMap.put("shareResourceWithUsers", new shareResourceWithUsers());
+ processMap.put("revokeSharingOfResourceFromUsers", new revokeSharingOfResourceFromUsers());
+ processMap.put("getAllAccessibleUsers", new getAllAccessibleUsers());
return processMap;
}
@@ -17651,6 +17912,98 @@ public class Airavata {
}
}
+ public static class shareResourceWithUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, shareResourceWithUsers_args> {
+ public shareResourceWithUsers() {
+ super("shareResourceWithUsers");
+ }
+
+ public shareResourceWithUsers_args getEmptyArgsInstance() {
+ return new shareResourceWithUsers_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public shareResourceWithUsers_result getResult(I iface, shareResourceWithUsers_args args) throws org.apache.thrift.TException {
+ shareResourceWithUsers_result result = new shareResourceWithUsers_result();
+ try {
+ result.success = iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList);
+ result.setSuccessIsSet(true);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ } catch (org.apache.airavata.model.error.AuthorizationException ae) {
+ result.ae = ae;
+ }
+ return result;
+ }
+ }
+
+ public static class revokeSharingOfResourceFromUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, revokeSharingOfResourceFromUsers_args> {
+ public revokeSharingOfResourceFromUsers() {
+ super("revokeSharingOfResourceFromUsers");
+ }
+
+ public revokeSharingOfResourceFromUsers_args getEmptyArgsInstance() {
+ return new revokeSharingOfResourceFromUsers_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public revokeSharingOfResourceFromUsers_result getResult(I iface, revokeSharingOfResourceFromUsers_args args) throws org.apache.thrift.TException {
+ revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
+ try {
+ result.success = iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList);
+ result.setSuccessIsSet(true);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ } catch (org.apache.airavata.model.error.AuthorizationException ae) {
+ result.ae = ae;
+ }
+ return result;
+ }
+ }
+
+ public static class getAllAccessibleUsers<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllAccessibleUsers_args> {
+ public getAllAccessibleUsers() {
+ super("getAllAccessibleUsers");
+ }
+
+ public getAllAccessibleUsers_args getEmptyArgsInstance() {
+ return new getAllAccessibleUsers_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getAllAccessibleUsers_result getResult(I iface, getAllAccessibleUsers_args args) throws org.apache.thrift.TException {
+ getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
+ try {
+ result.success = iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ } catch (org.apache.airavata.model.error.AuthorizationException ae) {
+ result.ae = ae;
+ }
+ return result;
+ }
+ }
+
}
public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
@@ -17805,6 +18158,9 @@ public class Airavata {
processMap.put("registerReplicaLocation", new registerReplicaLocation());
processMap.put("getParentDataProduct", new getParentDataProduct());
processMap.put("getChildDataProducts", new getChildDataProducts());
+ processMap.put("shareResourceWithUsers", new shareResourceWithUsers());
+ processMap.put("revokeSharingOfResourceFromUsers", new revokeSharingOfResourceFromUsers());
+ processMap.put("getAllAccessibleUsers", new getAllAccessibleUsers());
return processMap;
}
@@ -28012,395 +28368,242 @@ public class Airavata {
}
}
- }
-
- public static class getAPIVersion_args implements org.apache.thrift.TBase<getAPIVersion_args, getAPIVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new getAPIVersion_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getAPIVersion_argsTupleSchemeFactory());
- }
-
- public org.apache.airavata.model.security.AuthzToken authzToken; // 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");
-
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
- static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not found.
- */
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 1: // AUTHZ_TOKEN
- return AUTHZ_TOKEN;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- public static _Fields findByName(String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final String _fieldName;
-
- _Fields(short thriftId, String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- public short getThriftFieldId() {
- return _thriftId;
+ public static class shareResourceWithUsers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, shareResourceWithUsers_args, Boolean> {
+ public shareResourceWithUsers() {
+ super("shareResourceWithUsers");
}
- public String getFieldName() {
- return _fieldName;
+ public shareResourceWithUsers_args getEmptyArgsInstance() {
+ return new shareResourceWithUsers_args();
}
- }
- // isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
- static {
- 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)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap);
- }
-
- public getAPIVersion_args() {
- }
-
- public getAPIVersion_args(
- org.apache.airavata.model.security.AuthzToken authzToken)
- {
- this();
- this.authzToken = authzToken;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public getAPIVersion_args(getAPIVersion_args other) {
- if (other.isSetAuthzToken()) {
- this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ shareResourceWithUsers_result result = new shareResourceWithUsers_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ shareResourceWithUsers_result result = new shareResourceWithUsers_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
}
- }
-
- public getAPIVersion_args deepCopy() {
- return new getAPIVersion_args(this);
- }
-
- @Override
- public void clear() {
- this.authzToken = null;
- }
- public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
- return this.authzToken;
- }
-
- public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
- this.authzToken = authzToken;
- return this;
- }
-
- public void unsetAuthzToken() {
- this.authzToken = null;
- }
-
- /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */
- public boolean isSetAuthzToken() {
- return this.authzToken != null;
- }
-
- public void setAuthzTokenIsSet(boolean value) {
- if (!value) {
- this.authzToken = null;
+ protected boolean isOneway() {
+ return false;
}
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case AUTHZ_TOKEN:
- if (value == null) {
- unsetAuthzToken();
- } else {
- setAuthzToken((org.apache.airavata.model.security.AuthzToken)value);
- }
- break;
+ public void start(I iface, shareResourceWithUsers_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList,resultHandler);
}
}
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case AUTHZ_TOKEN:
- return getAuthzToken();
-
+ public static class revokeSharingOfResourceFromUsers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, revokeSharingOfResourceFromUsers_args, Boolean> {
+ public revokeSharingOfResourceFromUsers() {
+ super("revokeSharingOfResourceFromUsers");
}
- throw new IllegalStateException();
- }
- /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
- public boolean isSet(_Fields field) {
- if (field == null) {
- throw new IllegalArgumentException();
+ public revokeSharingOfResourceFromUsers_args getEmptyArgsInstance() {
+ return new revokeSharingOfResourceFromUsers_args();
}
- switch (field) {
- case AUTHZ_TOKEN:
- return isSetAuthzToken();
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
}
- throw new IllegalStateException();
- }
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof getAPIVersion_args)
- return this.equals((getAPIVersion_args)that);
- return false;
- }
-
- public boolean equals(getAPIVersion_args that) {
- if (that == null)
+ protected boolean isOneway() {
return false;
-
- boolean this_present_authzToken = true && this.isSetAuthzToken();
- boolean that_present_authzToken = true && that.isSetAuthzToken();
- if (this_present_authzToken || that_present_authzToken) {
- if (!(this_present_authzToken && that_present_authzToken))
- return false;
- if (!this.authzToken.equals(that.authzToken))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_authzToken = true && (isSetAuthzToken());
- list.add(present_authzToken);
- if (present_authzToken)
- list.add(authzToken);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(getAPIVersion_args other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAuthzToken()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder("getAPIVersion_args(");
- boolean first = true;
-
- sb.append("authzToken:");
- if (this.authzToken == null) {
- sb.append("null");
- } else {
- sb.append(this.authzToken);
}
- first = false;
- sb.append(")");
- return sb.toString();
- }
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- if (authzToken == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
- }
- // check for sub-struct validity
- if (authzToken != null) {
- authzToken.validate();
+ public void start(I iface, revokeSharingOfResourceFromUsers_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList,resultHandler);
}
}
- private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
- try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
+ public static class getAllAccessibleUsers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllAccessibleUsers_args, List<String>> {
+ public getAllAccessibleUsers() {
+ super("getAllAccessibleUsers");
}
- }
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
- try {
- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
+ public getAllAccessibleUsers_args getEmptyArgsInstance() {
+ return new getAllAccessibleUsers_args();
}
- }
- private static class getAPIVersion_argsStandardSchemeFactory implements SchemeFactory {
- public getAPIVersion_argsStandardScheme getScheme() {
- return new getAPIVersion_argsStandardScheme();
- }
- }
-
- private static class getAPIVersion_argsStandardScheme extends StandardScheme<getAPIVersion_args> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
- iprot.readStructBegin();
- while (true)
- {
- schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
- break;
+ public AsyncMethodCallback<List<String>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<List<String>>() {
+ public void onComplete(List<String> o) {
+ getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
}
- switch (schemeField.id) {
- case 1: // AUTHZ_TOKEN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
- struct.authzToken.read(iprot);
- struct.setAuthzTokenIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
}
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.authzToken != null) {
- oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
- struct.authzToken.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class getAPIVersion_argsTupleSchemeFactory implements SchemeFactory {
- public getAPIVersion_argsTupleScheme getScheme() {
- return new getAPIVersion_argsTupleScheme();
+ };
}
- }
- private static class getAPIVersion_argsTupleScheme extends TupleScheme<getAPIVersion_args> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- struct.authzToken.write(oprot);
+ protected boolean isOneway() {
+ return false;
}
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
- struct.authzToken.read(iprot);
- struct.setAuthzTokenIsSet(true);
+ public void start(I iface, getAllAccessibleUsers_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException {
+ iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType,resultHandler);
}
}
}
- public static class getAPIVersion_result implements org.apache.thrift.TBase<getAPIVersion_result, getAPIVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result");
+ public static class getAPIVersion_args implements org.apache.thrift.TBase<getAPIVersion_args, getAPIVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_args");
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
- private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
- private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+ 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new getAPIVersion_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getAPIVersion_resultTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAPIVersion_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAPIVersion_argsTupleSchemeFactory());
}
- public String success; // required
- public org.apache.airavata.model.error.InvalidRequestException ire; // required
- public org.apache.airavata.model.error.AiravataClientException ace; // required
- public org.apache.airavata.model.error.AiravataSystemException ase; // required
- public org.apache.airavata.model.error.AuthorizationException ae; // required
+ public org.apache.airavata.model.security.AuthzToken authzToken; // 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 {
- SUCCESS((short)0, "success"),
- IRE((short)1, "ire"),
- ACE((short)2, "ace"),
- ASE((short)3, "ase"),
- AE((short)4, "ae");
+ AUTHZ_TOKEN((short)1, "authzToken");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -28415,16 +28618,387 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 0: // SUCCESS
- return SUCCESS;
- case 1: // IRE
- return IRE;
- case 2: // ACE
- return ACE;
- case 3: // ASE
- return ASE;
- case 4: // AE
- return AE;
+ case 1: // AUTHZ_TOKEN
+ return AUTHZ_TOKEN;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ 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)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap);
+ }
+
+ public getAPIVersion_args() {
+ }
+
+ public getAPIVersion_args(
+ org.apache.airavata.model.security.AuthzToken authzToken)
+ {
+ this();
+ this.authzToken = authzToken;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public getAPIVersion_args(getAPIVersion_args other) {
+ if (other.isSetAuthzToken()) {
+ this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ }
+ }
+
+ public getAPIVersion_args deepCopy() {
+ return new getAPIVersion_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.authzToken = null;
+ }
+
+ public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
+ return this.authzToken;
+ }
+
+ public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+ this.authzToken = authzToken;
+ return this;
+ }
+
+ public void unsetAuthzToken() {
+ this.authzToken = null;
+ }
+
+ /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */
+ public boolean isSetAuthzToken() {
+ return this.authzToken != null;
+ }
+
+ public void setAuthzTokenIsSet(boolean value) {
+ if (!value) {
+ this.authzToken = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case AUTHZ_TOKEN:
+ if (value == null) {
+ unsetAuthzToken();
+ } else {
+ setAuthzToken((org.apache.airavata.model.security.AuthzToken)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case AUTHZ_TOKEN:
+ return getAuthzToken();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case AUTHZ_TOKEN:
+ return isSetAuthzToken();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof getAPIVersion_args)
+ return this.equals((getAPIVersion_args)that);
+ return false;
+ }
+
+ public boolean equals(getAPIVersion_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_authzToken = true && this.isSetAuthzToken();
+ boolean that_present_authzToken = true && that.isSetAuthzToken();
+ if (this_present_authzToken || that_present_authzToken) {
+ if (!(this_present_authzToken && that_present_authzToken))
+ return false;
+ if (!this.authzToken.equals(that.authzToken))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_authzToken = true && (isSetAuthzToken());
+ list.add(present_authzToken);
+ if (present_authzToken)
+ list.add(authzToken);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(getAPIVersion_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAuthzToken()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("getAPIVersion_args(");
+ boolean first = true;
+
+ sb.append("authzToken:");
+ if (this.authzToken == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.authzToken);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (authzToken == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
+ }
+ // check for sub-struct validity
+ if (authzToken != null) {
+ authzToken.validate();
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class getAPIVersion_argsStandardSchemeFactory implements SchemeFactory {
+ public getAPIVersion_argsStandardScheme getScheme() {
+ return new getAPIVersion_argsStandardScheme();
+ }
+ }
+
+ private static class getAPIVersion_argsStandardScheme extends StandardScheme<getAPIVersion_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // AUTHZ_TOKEN
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
+ struct.authzToken.read(iprot);
+ struct.setAuthzTokenIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.authzToken != null) {
+ oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
+ struct.authzToken.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class getAPIVersion_argsTupleSchemeFactory implements SchemeFactory {
+ public getAPIVersion_argsTupleScheme getScheme() {
+ return new getAPIVersion_argsTupleScheme();
+ }
+ }
+
+ private static class getAPIVersion_argsTupleScheme extends TupleScheme<getAPIVersion_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.authzToken.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
+ struct.authzToken.read(iprot);
+ struct.setAuthzTokenIsSet(true);
+ }
+ }
+
+ }
+
+ public static class getAPIVersion_result implements org.apache.thrift.TBase<getAPIVersion_result, getAPIVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result");
+
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
+ private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+ private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new getAPIVersion_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAPIVersion_resultTupleSchemeFactory());
+ }
+
+ public String success; // required
+ public org.apache.airavata.model.error.InvalidRequestException ire; // required
+ public org.apache.airavata.model.error.AiravataClientException ace; // required
+ public org.apache.airavata.model.error.AiravataSystemException ase; // required
+ public org.apache.airavata.model.error.AuthorizationException ae; // 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 {
+ SUCCESS((short)0, "success"),
+ IRE((short)1, "ire"),
+ ACE((short)2, "ace"),
+ ASE((short)3, "ase"),
+ AE((short)4, "ae");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 0: // SUCCESS
+ return SUCCESS;
+ case 1: // IRE
+ return IRE;
+ case 2: // ACE
+ return ACE;
+ case 3: // ASE
+ return ASE;
+ case 4: // AE
+ return AE;
default:
return null;
}
@@ -78335,9 +78909,3950 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("updateResourceScheduleing_result(");
+ StringBuilder sb = new StringBuilder("updateResourceScheduleing_result(");
+ boolean first = true;
+
+ sb.append("ae:");
+ if (this.ae == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ae);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class updateResourceScheduleing_resultStandardSchemeFactory implements SchemeFactory {
+ public updateResourceScheduleing_resultStandardScheme getScheme() {
+ return new updateResourceScheduleing_resultStandardScheme();
+ }
+ }
+
+ private static class updateResourceScheduleing_resultStandardScheme extends StandardScheme<updateResourceScheduleing_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, updateResourceScheduleing_result struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // AE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ae = new org.apache.airavata.model.error.AuthorizationException();
+ struct.ae.read(iprot);
+ struct.setAeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, updateResourceScheduleing_result struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.ae != null) {
+ oprot.writeFieldBegin(AE_FIELD_DESC);
+ struct.ae.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class updateResourceScheduleing_resultTupleSchemeFactory implements SchemeFactory {
+ public updateResourceScheduleing_resultTupleScheme getScheme() {
+ return new updateResourceScheduleing_resultTupleScheme();
+ }
+ }
+
+ private static class updateResourceScheduleing_resultTupleScheme extends TupleScheme<updateResourceScheduleing_result> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, updateResourceScheduleing_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetAe()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetAe()) {
+ struct.ae.write(oprot);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, updateResourceScheduleing_result struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.ae = new org.apache.airavata.model.error.AuthorizationException();
+ struct.ae.read(iprot);
+ struct.setAeIsSet(true);
+ }
+ }
+ }
+
+ }
+
+ public static class validateExperiment_args implements org.apache.thrift.TBase<validateExperiment_args, validateExperiment_args._Fields>, java.io.Serializable, Cloneable, Comparable<validateExperiment_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("validateExperiment_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 AIRAVATA_EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataExperimentId", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new validateExperiment_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new validateExperiment_argsTupleSchemeFactory());
+ }
+
+ public org.apache.airavata.model.security.AuthzToken authzToken; // required
+ public String airavataExperimentId; // 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"),
+ AIRAVATA_EXPERIMENT_ID((short)2, "airavataExperimentId");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // AUTHZ_TOKEN
+ return AUTHZ_TOKEN;
+ case 2: // AIRAVATA_EXPERIMENT_ID
+ return AIRAVATA_EXPERIMENT_ID;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ 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.AIRAVATA_EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataExperimentId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(validateExperiment_args.class, metaDataMap);
+ }
+
+ public validateExperiment_args() {
+ }
+
+ public validateExperiment_args(
+ org.apache.airavata.model.security.AuthzToken authzToken,
+ String airavataExperimentId)
+ {
+ this();
+ this.authzToken = authzToken;
+ this.airavataExperimentId = airavataExperimentId;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public validateExperiment_args(validateExperiment_args other) {
+ if (other.isSetAuthzToken()) {
+ this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ }
+ if (other.isSetAiravataExperimentId()) {
+ this.airavataExperimentId = other.airavataExperimentId;
+ }
+ }
+
+ public validateExperiment_args deepCopy() {
+ return new validateExperiment_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.authzToken = null;
+ this.airavataExperimentId = null;
+ }
+
+ public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
+ return this.authzToken;
+ }
+
+ public validateExperiment_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+ this.authzToken = authzToken;
+ return this;
+ }
+
+ public void unsetAuthzToken() {
+ this.authzToken = null;
+ }
+
+ /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */
+ public boolean isSetAuthzToken() {
+ return this.authzToken != null;
+ }
+
+ public void setAuthzTokenIsSet(boolean value) {
+ if (!value) {
+ this.authzToken = null;
+ }
+ }
+
+ public String getAiravataExperimentId() {
+ return this.airavataExperimentId;
+ }
+
+ public validateExperiment_args setAiravataExperimentId(String airavataExperimentId) {
+ this.airavataExperimentId = airavataExperimentId;
+ return this;
+ }
+
+ public void unsetAiravataExperimentId() {
+ this.airavataExperimentId = null;
+ }
+
+ /** Returns true if field airavataExperimentId is set (has been assigned a value) and false otherwise */
+ public boolean isSetAiravataExperimentId() {
+ return this.airavataExperimentId != null;
+ }
+
+ public void setAiravataExperimentIdIsSet(boolean value) {
+ if (!value) {
+ this.airavataExperimentId = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case AUTHZ_TOKEN:
+ if (value == null) {
+ unsetAuthzToken();
+ } else {
+ setAuthzToken((org.apache.airavata.model.security.AuthzToken)value);
+ }
+ break;
+
+ case AIRAVATA_EXPERIMENT_ID:
+ if (value == null) {
+ unsetAiravataExperimentId();
+ } else {
+ setAiravataExperimentId((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case AUTHZ_TOKEN:
+ return getAuthzToken();
+
+ case AIRAVATA_EXPERIMENT_ID:
+ return getAiravataExperimentId();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case AUTHZ_TOKEN:
+ return isSetAuthzToken();
+ case AIRAVATA_EXPERIMENT_ID:
+ return isSetAiravataExperimentId();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof validateExperiment_args)
+ return this.equals((validateExperiment_args)that);
+ return false;
+ }
+
+ public boolean equals(validateExperiment_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_authzToken = true && this.isSetAuthzToken();
+ boolean that_present_authzToken = true && that.isSetAuthzToken();
+ if (this_present_authzToken || that_present_authzToken) {
+ if (!(this_present_authzToken && that_present_authzToken))
+ return false;
+ if (!this.authzToken.equals(that.authzToken))
+ return false;
+ }
+
+ boolean this_present_airavataExperimentId = true && this.isSetAiravataExperimentId();
+ boolean that_present_airavataExperimentId = true && that.isSetAiravataExperimentId();
+ if (this_present_airavataExperimentId || that_present_airavataExperimentId) {
+ if (!(this_present_airavataExperimentId && that_present_airavataExperimentId))
+ return false;
+ if (!this.airavataExperimentId.equals(that.airavataExperimentId))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_authzToken = true && (isSetAuthzToken());
+ list.add(present_authzToken);
+ if (present_authzToken)
+ list.add(authzToken);
+
+ boolean present_airavataExperimentId = true && (isSetAiravataExperimentId());
+ list.add(present_airavataExperimentId);
+ if (present_airavataExperimentId)
+ list.add(airavataExperimentId);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(validateExperiment_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAuthzToken()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAiravataExperimentId()).compareTo(other.isSetAiravataExperimentId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAiravataExperimentId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.airavataExperimentId, other.airavataExperimentId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("validateExperiment_args(");
+ boolean first = true;
+
+ sb.append("authzToken:");
+ if (this.authzToken == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.authzToken);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("airavataExperimentId:");
+ if (this.airavataExperimentId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.airavataExperimentId);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (authzToken == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
+ }
+ if (airavataExperimentId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataExperimentId' was not present! Struct: " + toString());
+ }
+ // check for sub-struct validity
+ if (authzToken != null) {
+ authzToken.validate();
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class validateExperiment_argsStandardSchemeFactory implements SchemeFactory {
+ public validateExperiment_argsStandardScheme getScheme() {
+ return new validateExperiment_argsStandardScheme();
+ }
+ }
+
+ private static class validateExperiment_argsStandardScheme extends StandardScheme<validateExperiment_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, validateExperiment_args struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // AUTHZ_TOKEN
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
+ struct.authzToken.read(iprot);
+ struct.setAuthzTokenIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // AIRAVATA_EXPERIMENT_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.airavataExperimentId = iprot.readString();
+ struct.setAiravataExperimentIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, validateExperiment_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.authzToken != null) {
+ oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
+ struct.authzToken.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.airavataExperimentId != null) {
+ oprot.writeFieldBegin(AIRAVATA_EXPERIMENT_ID_FIELD_DESC);
+ oprot.writeString(struct.airavataExperimentId);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class validateExperiment_argsTupleSchemeFactory implements SchemeFactory {
+ public validateExperiment_argsTupleScheme getScheme() {
+ return new validateExperiment_argsTupleScheme();
+ }
+ }
+
+ private static class validateExperiment_argsTupleScheme extends TupleScheme<validateExperiment_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, validateExperiment_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.authzToken.write(oprot);
+ oprot.writeString(struct.airavataExperimentId);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot,
<TRUNCATED>
[04/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index a73f2c1..1cae97f 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -2846,6 +2846,39 @@ class Iface:
"""
pass
+ def shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ """
+ Group Manager and Data Sharing Related API methods
+
+
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - userPermissionList
+ """
+ pass
+
+ def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ """
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - userPermissionList
+ """
+ pass
+
+ def getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+ """
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - permissionType
+ """
+ pass
+
class Client(Iface):
def __init__(self, iprot, oprot=None):
@@ -10418,6 +10451,144 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getChildDataProducts failed: unknown result")
+ def shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ """
+ Group Manager and Data Sharing Related API methods
+
+
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - userPermissionList
+ """
+ self.send_shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList)
+ return self.recv_shareResourceWithUsers()
+
+ def send_shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ self._oprot.writeMessageBegin('shareResourceWithUsers', TMessageType.CALL, self._seqid)
+ args = shareResourceWithUsers_args()
+ args.authzToken = authzToken
+ args.resourceId = resourceId
+ args.resourceType = resourceType
+ args.userPermissionList = userPermissionList
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_shareResourceWithUsers(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ raise x
+ result = shareResourceWithUsers_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success is not None:
+ return result.success
+ if result.ire is not None:
+ raise result.ire
+ if result.ace is not None:
+ raise result.ace
+ if result.ase is not None:
+ raise result.ase
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "shareResourceWithUsers failed: unknown result")
+
+ def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ """
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - userPermissionList
+ """
+ self.send_revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList)
+ return self.recv_revokeSharingOfResourceFromUsers()
+
+ def send_revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+ self._oprot.writeMessageBegin('revokeSharingOfResourceFromUsers', TMessageType.CALL, self._seqid)
+ args = revokeSharingOfResourceFromUsers_args()
+ args.authzToken = authzToken
+ args.resourceId = resourceId
+ args.resourceType = resourceType
+ args.userPermissionList = userPermissionList
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_revokeSharingOfResourceFromUsers(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ raise x
+ result = revokeSharingOfResourceFromUsers_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success is not None:
+ return result.success
+ if result.ire is not None:
+ raise result.ire
+ if result.ace is not None:
+ raise result.ace
+ if result.ase is not None:
+ raise result.ase
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromUsers failed: unknown result")
+
+ def getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+ """
+ Parameters:
+ - authzToken
+ - resourceId
+ - resourceType
+ - permissionType
+ """
+ self.send_getAllAccessibleUsers(authzToken, resourceId, resourceType, permissionType)
+ return self.recv_getAllAccessibleUsers()
+
+ def send_getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+ self._oprot.writeMessageBegin('getAllAccessibleUsers', TMessageType.CALL, self._seqid)
+ args = getAllAccessibleUsers_args()
+ args.authzToken = authzToken
+ args.resourceId = resourceId
+ args.resourceType = resourceType
+ args.permissionType = permissionType
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_getAllAccessibleUsers(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ raise x
+ result = getAllAccessibleUsers_result()
+ result.read(iprot)
+ iprot.readMessageEnd()
+ if result.success is not None:
+ return result.success
+ if result.ire is not None:
+ raise result.ire
+ if result.ace is not None:
+ raise result.ace
+ if result.ase is not None:
+ raise result.ase
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result")
+
class Processor(Iface, TProcessor):
def __init__(self, handler):
@@ -10564,6 +10735,9 @@ class Processor(Iface, TProcessor):
self._processMap["registerReplicaLocation"] = Processor.process_registerReplicaLocation
self._processMap["getParentDataProduct"] = Processor.process_getParentDataProduct
self._processMap["getChildDataProducts"] = Processor.process_getChildDataProducts
+ self._processMap["shareResourceWithUsers"] = Processor.process_shareResourceWithUsers
+ self._processMap["revokeSharingOfResourceFromUsers"] = Processor.process_revokeSharingOfResourceFromUsers
+ self._processMap["getAllAccessibleUsers"] = Processor.process_getAllAccessibleUsers
def process(self, iprot, oprot):
(name, type, seqid) = iprot.readMessageBegin()
@@ -14960,6 +15134,99 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
+ def process_shareResourceWithUsers(self, seqid, iprot, oprot):
+ args = shareResourceWithUsers_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = shareResourceWithUsers_result()
+ try:
+ result.success = self._handler.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+ msg_type = TMessageType.REPLY
+ result.ire = ire
+ except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+ msg_type = TMessageType.REPLY
+ result.ace = ace
+ except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+ msg_type = TMessageType.REPLY
+ result.ase = ase
+ except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("shareResourceWithUsers", msg_type, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_revokeSharingOfResourceFromUsers(self, seqid, iprot, oprot):
+ args = revokeSharingOfResourceFromUsers_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = revokeSharingOfResourceFromUsers_result()
+ try:
+ result.success = self._handler.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+ msg_type = TMessageType.REPLY
+ result.ire = ire
+ except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+ msg_type = TMessageType.REPLY
+ result.ace = ace
+ except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+ msg_type = TMessageType.REPLY
+ result.ase = ase
+ except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("revokeSharingOfResourceFromUsers", msg_type, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
+ def process_getAllAccessibleUsers(self, seqid, iprot, oprot):
+ args = getAllAccessibleUsers_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = getAllAccessibleUsers_result()
+ try:
+ result.success = self._handler.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+ msg_type = TMessageType.REPLY
+ result.ire = ire
+ except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+ msg_type = TMessageType.REPLY
+ result.ace = ace
+ except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+ msg_type = TMessageType.REPLY
+ result.ase = ase
+ except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getAllAccessibleUsers", msg_type, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
# HELPER FUNCTIONS AND STRUCTURES
@@ -22657,8 +22924,394 @@ class updateExperiment_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRUCT:
- self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
- self.experiment.read(iprot)
+ self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ self.experiment.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('updateExperiment_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
+ if self.airavataExperimentId is not None:
+ oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
+ oprot.writeString(self.airavataExperimentId)
+ oprot.writeFieldEnd()
+ if self.experiment is not None:
+ oprot.writeFieldBegin('experiment', TType.STRUCT, 3)
+ self.experiment.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.authzToken is None:
+ raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
+ if self.airavataExperimentId is None:
+ raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
+ if self.experiment is None:
+ raise TProtocol.TProtocolException(message='Required field experiment is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.authzToken)
+ value = (value * 31) ^ hash(self.airavataExperimentId)
+ value = (value * 31) ^ hash(self.experiment)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class updateExperiment_result:
+ """
+ Attributes:
+ - ire
+ - enf
+ - ace
+ - ase
+ - ae
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
+ (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
+ )
+
+ def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ self.ire = ire
+ self.enf = enf
+ self.ace = ace
+ self.ase = ase
+ self.ae = ae
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+ self.enf.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRUCT:
+ self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('updateExperiment_result')
+ if self.ire is not None:
+ oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+ self.ire.write(oprot)
+ oprot.writeFieldEnd()
+ if self.enf is not None:
+ oprot.writeFieldBegin('enf', TType.STRUCT, 2)
+ self.enf.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ace is not None:
+ oprot.writeFieldBegin('ace', TType.STRUCT, 3)
+ self.ace.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ase is not None:
+ oprot.writeFieldBegin('ase', TType.STRUCT, 4)
+ self.ase.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 5)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.ire)
+ value = (value * 31) ^ hash(self.enf)
+ value = (value * 31) ^ hash(self.ace)
+ value = (value * 31) ^ hash(self.ase)
+ value = (value * 31) ^ hash(self.ae)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class updateExperimentConfiguration_args:
+ """
+ Attributes:
+ - authzToken
+ - airavataExperimentId
+ - userConfiguration
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
+ (3, TType.STRUCT, 'userConfiguration', (apache.airavata.model.experiment.ttypes.UserConfigurationDataModel, apache.airavata.model.experiment.ttypes.UserConfigurationDataModel.thrift_spec), None, ), # 3
+ )
+
+ def __init__(self, authzToken=None, airavataExperimentId=None, userConfiguration=None,):
+ self.authzToken = authzToken
+ self.airavataExperimentId = airavataExperimentId
+ self.userConfiguration = userConfiguration
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.airavataExperimentId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.userConfiguration = apache.airavata.model.experiment.ttypes.UserConfigurationDataModel()
+ self.userConfiguration.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('updateExperimentConfiguration_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
+ if self.airavataExperimentId is not None:
+ oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
+ oprot.writeString(self.airavataExperimentId)
+ oprot.writeFieldEnd()
+ if self.userConfiguration is not None:
+ oprot.writeFieldBegin('userConfiguration', TType.STRUCT, 3)
+ self.userConfiguration.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.authzToken is None:
+ raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
+ if self.airavataExperimentId is None:
+ raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
+ if self.userConfiguration is None:
+ raise TProtocol.TProtocolException(message='Required field userConfiguration is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.authzToken)
+ value = (value * 31) ^ hash(self.airavataExperimentId)
+ value = (value * 31) ^ hash(self.userConfiguration)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class updateExperimentConfiguration_result:
+ """
+ Attributes:
+ - ae
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 1
+ )
+
+ def __init__(self, ae=None,):
+ self.ae = ae
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('updateExperimentConfiguration_result')
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 1)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.ae)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class updateResourceScheduleing_args:
+ """
+ Attributes:
+ - authzToken
+ - airavataExperimentId
+ - resourceScheduling
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
+ (3, TType.STRUCT, 'resourceScheduling', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ), # 3
+ )
+
+ def __init__(self, authzToken=None, airavataExperimentId=None, resourceScheduling=None,):
+ self.authzToken = authzToken
+ self.airavataExperimentId = airavataExperimentId
+ self.resourceScheduling = resourceScheduling
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.airavataExperimentId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.resourceScheduling = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
+ self.resourceScheduling.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -22670,7 +23323,7 @@ class updateExperiment_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateExperiment_args')
+ oprot.writeStructBegin('updateResourceScheduleing_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22679,9 +23332,9 @@ class updateExperiment_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.experiment is not None:
- oprot.writeFieldBegin('experiment', TType.STRUCT, 3)
- self.experiment.write(oprot)
+ if self.resourceScheduling is not None:
+ oprot.writeFieldBegin('resourceScheduling', TType.STRUCT, 3)
+ self.resourceScheduling.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22691,8 +23344,8 @@ class updateExperiment_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.airavataExperimentId is None:
raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
- if self.experiment is None:
- raise TProtocol.TProtocolException(message='Required field experiment is unset!')
+ if self.resourceScheduling is None:
+ raise TProtocol.TProtocolException(message='Required field resourceScheduling is unset!')
return
@@ -22700,7 +23353,7 @@ class updateExperiment_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.experiment)
+ value = (value * 31) ^ hash(self.resourceScheduling)
return value
def __repr__(self):
@@ -22714,30 +23367,18 @@ class updateExperiment_args:
def __ne__(self, other):
return not (self == other)
-class updateExperiment_result:
+class updateResourceScheduleing_result:
"""
Attributes:
- - ire
- - enf
- - ace
- - ase
- ae
"""
thrift_spec = (
None, # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
- (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
+ (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 1
)
- def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
- self.ire = ire
- self.enf = enf
- self.ace = ace
- self.ase = ase
+ def __init__(self, ae=None,):
self.ae = ae
def read(self, iprot):
@@ -22751,30 +23392,6 @@ class updateExperiment_result:
break
if fid == 1:
if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
- self.enf.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.STRUCT:
self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
self.ae.read(iprot)
else:
@@ -22788,25 +23405,9 @@ class updateExperiment_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateExperiment_result')
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.enf is not None:
- oprot.writeFieldBegin('enf', TType.STRUCT, 2)
- self.enf.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 3)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 4)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
+ oprot.writeStructBegin('updateResourceScheduleing_result')
if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 5)
+ oprot.writeFieldBegin('ae', TType.STRUCT, 1)
self.ae.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -22818,10 +23419,6 @@ class updateExperiment_result:
def __hash__(self):
value = 17
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.enf)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
value = (value * 31) ^ hash(self.ae)
return value
@@ -22836,25 +23433,22 @@ class updateExperiment_result:
def __ne__(self, other):
return not (self == other)
-class updateExperimentConfiguration_args:
+class validateExperiment_args:
"""
Attributes:
- authzToken
- airavataExperimentId
- - userConfiguration
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
- (3, TType.STRUCT, 'userConfiguration', (apache.airavata.model.experiment.ttypes.UserConfigurationDataModel, apache.airavata.model.experiment.ttypes.UserConfigurationDataModel.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None, userConfiguration=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
- self.userConfiguration = userConfiguration
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -22876,12 +23470,6 @@ class updateExperimentConfiguration_args:
self.airavataExperimentId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.userConfiguration = apache.airavata.model.experiment.ttypes.UserConfigurationDataModel()
- self.userConfiguration.read(iprot)
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -22891,7 +23479,7 @@ class updateExperimentConfiguration_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateExperimentConfiguration_args')
+ oprot.writeStructBegin('validateExperiment_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22900,10 +23488,6 @@ class updateExperimentConfiguration_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.userConfiguration is not None:
- oprot.writeFieldBegin('userConfiguration', TType.STRUCT, 3)
- self.userConfiguration.write(oprot)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22912,8 +23496,6 @@ class updateExperimentConfiguration_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.airavataExperimentId is None:
raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
- if self.userConfiguration is None:
- raise TProtocol.TProtocolException(message='Required field userConfiguration is unset!')
return
@@ -22921,7 +23503,6 @@ class updateExperimentConfiguration_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.userConfiguration)
return value
def __repr__(self):
@@ -22935,18 +23516,32 @@ class updateExperimentConfiguration_args:
def __ne__(self, other):
return not (self == other)
-class updateExperimentConfiguration_result:
+class validateExperiment_result:
"""
Attributes:
+ - success
+ - ire
+ - enf
+ - ace
+ - ase
- ae
"""
thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 1
+ (0, TType.BOOL, 'success', None, None, ), # 0
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
+ (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
)
- def __init__(self, ae=None,):
+ def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ self.success = success
+ self.ire = ire
+ self.enf = enf
+ self.ace = ace
+ self.ase = ase
self.ae = ae
def read(self, iprot):
@@ -22958,7 +23553,36 @@ class updateExperimentConfiguration_result:
(fname, ftype, fid) = iprot.readFieldBegin()
if ftype == TType.STOP:
break
- if fid == 1:
+ if fid == 0:
+ if ftype == TType.BOOL:
+ self.success = iprot.readBool()
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+ self.enf.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.STRUCT:
self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
self.ae.read(iprot)
@@ -22973,9 +23597,29 @@ class updateExperimentConfiguration_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateExperimentConfiguration_result')
+ oprot.writeStructBegin('validateExperiment_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
+ oprot.writeFieldEnd()
+ if self.ire is not None:
+ oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+ self.ire.write(oprot)
+ oprot.writeFieldEnd()
+ if self.enf is not None:
+ oprot.writeFieldBegin('enf', TType.STRUCT, 2)
+ self.enf.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ace is not None:
+ oprot.writeFieldBegin('ace', TType.STRUCT, 3)
+ self.ace.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ase is not None:
+ oprot.writeFieldBegin('ase', TType.STRUCT, 4)
+ self.ase.write(oprot)
+ oprot.writeFieldEnd()
if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 1)
+ oprot.writeFieldBegin('ae', TType.STRUCT, 5)
self.ae.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -22987,6 +23631,11 @@ class updateExperimentConfiguration_result:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.success)
+ value = (value * 31) ^ hash(self.ire)
+ value = (value * 31) ^ hash(self.enf)
+ value = (value * 31) ^ hash(self.ace)
+ value = (value * 31) ^ hash(self.ase)
value = (value * 31) ^ hash(self.ae)
return value
@@ -23001,25 +23650,25 @@ class updateExperimentConfiguration_result:
def __ne__(self, other):
return not (self == other)
-class updateResourceScheduleing_args:
+class launchExperiment_args:
"""
Attributes:
- authzToken
- airavataExperimentId
- - resourceScheduling
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
- (3, TType.STRUCT, 'resourceScheduling', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ), # 3
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None, resourceScheduling=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None, gatewayId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
- self.resourceScheduling = resourceScheduling
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -23042,9 +23691,8 @@ class updateResourceScheduleing_args:
else:
iprot.skip(ftype)
elif fid == 3:
- if ftype == TType.STRUCT:
- self.resourceScheduling = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
- self.resourceScheduling.read(iprot)
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -23056,7 +23704,7 @@ class updateResourceScheduleing_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateResourceScheduleing_args')
+ oprot.writeStructBegin('launchExperiment_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23065,9 +23713,9 @@ class updateResourceScheduleing_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.resourceScheduling is not None:
- oprot.writeFieldBegin('resourceScheduling', TType.STRUCT, 3)
- self.resourceScheduling.write(oprot)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23077,8 +23725,8 @@ class updateResourceScheduleing_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.airavataExperimentId is None:
raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
- if self.resourceScheduling is None:
- raise TProtocol.TProtocolException(message='Required field resourceScheduling is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
@@ -23086,7 +23734,7 @@ class updateResourceScheduleing_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.resourceScheduling)
+ value = (value * 31) ^ hash(self.gatewayId)
return value
def __repr__(self):
@@ -23100,18 +23748,30 @@ class updateResourceScheduleing_args:
def __ne__(self, other):
return not (self == other)
-class updateResourceScheduleing_result:
+class launchExperiment_result:
"""
Attributes:
+ - ire
+ - enf
+ - ace
+ - ase
- ae
"""
thrift_spec = (
None, # 0
- (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 1
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
+ (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
)
- def __init__(self, ae=None,):
+ def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ self.ire = ire
+ self.enf = enf
+ self.ace = ace
+ self.ase = ase
self.ae = ae
def read(self, iprot):
@@ -23125,6 +23785,30 @@ class updateResourceScheduleing_result:
break
if fid == 1:
if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+ self.enf.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRUCT:
self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
self.ae.read(iprot)
else:
@@ -23138,9 +23822,25 @@ class updateResourceScheduleing_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateResourceScheduleing_result')
+ oprot.writeStructBegin('launchExperiment_result')
+ if self.ire is not None:
+ oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+ self.ire.write(oprot)
+ oprot.writeFieldEnd()
+ if self.enf is not None:
+ oprot.writeFieldBegin('enf', TType.STRUCT, 2)
+ self.enf.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ace is not None:
+ oprot.writeFieldBegin('ace', TType.STRUCT, 3)
+ self.ace.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ase is not None:
+ oprot.writeFieldBegin('ase', TType.STRUCT, 4)
+ self.ase.write(oprot)
+ oprot.writeFieldEnd()
if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 1)
+ oprot.writeFieldBegin('ae', TType.STRUCT, 5)
self.ae.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -23152,6 +23852,10 @@ class updateResourceScheduleing_result:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.ire)
+ value = (value * 31) ^ hash(self.enf)
+ value = (value * 31) ^ hash(self.ace)
+ value = (value * 31) ^ hash(self.ase)
value = (value * 31) ^ hash(self.ae)
return value
@@ -23166,7 +23870,7 @@ class updateResourceScheduleing_result:
def __ne__(self, other):
return not (self == other)
-class validateExperiment_args:
+class getExperimentStatus_args:
"""
Attributes:
- authzToken
@@ -23212,7 +23916,7 @@ class validateExperiment_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('validateExperiment_args')
+ oprot.writeStructBegin('getExperimentStatus_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23249,7 +23953,7 @@ class validateExperiment_args:
def __ne__(self, other):
return not (self == other)
-class validateExperiment_result:
+class getExperimentStatus_result:
"""
Attributes:
- success
@@ -23261,7 +23965,7 @@ class validateExperiment_result:
"""
thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
+ (0, TType.STRUCT, 'success', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -23287,8 +23991,9 @@ class validateExperiment_result:
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
+ if ftype == TType.STRUCT:
+ self.success = apache.airavata.model.status.ttypes.ExperimentStatus()
+ self.success.read(iprot)
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23330,10 +24035,10 @@ class validateExperiment_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('validateExperiment_result')
+ oprot.writeStructBegin('getExperimentStatus_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23383,25 +24088,22 @@ class validateExperiment_result:
def __ne__(self, other):
return not (self == other)
-class launchExperiment_args:
+class getExperimentOutputs_args:
"""
Attributes:
- authzToken
- airavataExperimentId
- - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None, gatewayId=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
- self.gatewayId = gatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -23423,11 +24125,6 @@ class launchExperiment_args:
self.airavataExperimentId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -23437,7 +24134,7 @@ class launchExperiment_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('launchExperiment_args')
+ oprot.writeStructBegin('getExperimentOutputs_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23446,10 +24143,6 @@ class launchExperiment_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23458,8 +24151,6 @@ class launchExperiment_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.airavataExperimentId is None:
raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
@@ -23467,7 +24158,6 @@ class launchExperiment_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.gatewayId)
return value
def __repr__(self):
@@ -23481,9 +24171,10 @@ class launchExperiment_args:
def __ne__(self, other):
return not (self == other)
-class launchExperiment_result:
+class getExperimentOutputs_result:
"""
Attributes:
+ - success
- ire
- enf
- ace
@@ -23492,7 +24183,7 @@ class launchExperiment_result:
"""
thrift_spec = (
- None, # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -23500,7 +24191,8 @@ class launchExperiment_result:
(5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
)
- def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ self.success = success
self.ire = ire
self.enf = enf
self.ace = ace
@@ -23516,7 +24208,18 @@ class launchExperiment_result:
(fname, ftype, fid) = iprot.readFieldBegin()
if ftype == TType.STOP:
break
- if fid == 1:
+ if fid == 0:
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype95, _size92) = iprot.readListBegin()
+ for _i96 in xrange(_size92):
+ _elem97 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem97.read(iprot)
+ self.success.append(_elem97)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
if ftype == TType.STRUCT:
self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
self.ire.read(iprot)
@@ -23555,7 +24258,14 @@ class launchExperiment_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('launchExperiment_result')
+ oprot.writeStructBegin('getExperimentOutputs_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter98 in self.success:
+ iter98.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
self.ire.write(oprot)
@@ -23585,6 +24295,7 @@ class launchExperiment_result:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.success)
value = (value * 31) ^ hash(self.ire)
value = (value * 31) ^ hash(self.enf)
value = (value * 31) ^ hash(self.ace)
@@ -23603,7 +24314,7 @@ class launchExperiment_result:
def __ne__(self, other):
return not (self == other)
-class getExperimentStatus_args:
+class getIntermediateOutputs_args:
"""
Attributes:
- authzToken
@@ -23649,7 +24360,7 @@ class getExperimentStatus_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getExperimentStatus_args')
+ oprot.writeStructBegin('getIntermediateOutputs_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23686,7 +24397,7 @@ class getExperimentStatus_args:
def __ne__(self, other):
return not (self == other)
-class getExperimentStatus_result:
+class getIntermediateOutputs_result:
"""
Attributes:
- success
@@ -23698,7 +24409,7 @@ class getExperimentStatus_result:
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -23724,9 +24435,14 @@ class getExperimentStatus_result:
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRUCT:
- self.success = apache.airavata.model.status.ttypes.ExperimentStatus()
- self.success.read(iprot)
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype102, _size99) = iprot.readListBegin()
+ for _i103 in xrange(_size99):
+ _elem104 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem104.read(iprot)
+ self.success.append(_elem104)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23768,10 +24484,13 @@ class getExperimentStatus_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getExperimentStatus_result')
+ oprot.writeStructBegin('getIntermediateOutputs_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter105 in self.success:
+ iter105.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23821,7 +24540,7 @@ class getExperimentStatus_result:
def __ne__(self, other):
return not (self == other)
-class getExperimentOutputs_args:
+class getJobStatuses_args:
"""
Attributes:
- authzToken
@@ -23867,7 +24586,7 @@ class getExperimentOutputs_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getExperimentOutputs_args')
+ oprot.writeStructBegin('getJobStatuses_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23904,7 +24623,7 @@ class getExperimentOutputs_args:
def __ne__(self, other):
return not (self == other)
-class getExperimentOutputs_result:
+class getJobStatuses_result:
"""
Attributes:
- success
@@ -23916,7 +24635,7 @@ class getExperimentOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -23942,14 +24661,15 @@ class getExperimentOutputs_result:
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype95, _size92) = iprot.readListBegin()
- for _i96 in xrange(_size92):
- _elem97 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem97.read(iprot)
- self.success.append(_elem97)
- iprot.readListEnd()
+ if ftype == TType.MAP:
+ self.success = {}
+ (_ktype107, _vtype108, _size106 ) = iprot.readMapBegin()
+ for _i110 in xrange(_size106):
+ _key111 = iprot.readString()
+ _val112 = apache.airavata.model.status.ttypes.JobStatus()
+ _val112.read(iprot)
+ self.success[_key111] = _val112
+ iprot.readMapEnd()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23991,13 +24711,14 @@ class getExperimentOutputs_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getExperimentOutputs_result')
+ oprot.writeStructBegin('getJobStatuses_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter98 in self.success:
- iter98.write(oprot)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.MAP, 0)
+ oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
+ for kiter113,viter114 in self.success.items():
+ oprot.writeString(kiter113)
+ viter114.write(oprot)
+ oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -24047,7 +24768,7 @@ class getExperimentOutputs_result:
def __ne__(self, other):
return not (self == other)
-class getIntermediateOutputs_args:
+class getJobDetails_args:
"""
Attributes:
- authzToken
@@ -24093,7 +24814,7 @@ class getIntermediateOutputs_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getIntermediateOutputs_args')
+ oprot.writeStructBegin('getJobDetails_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -24130,7 +24851,7 @@ class getIntermediateOutputs_args:
def __ne__(self, other):
return not (self == other)
-class getIntermediateOutputs_result:
+class getJobDetails_result:
"""
Attributes:
- success
@@ -24142,7 +24863,7 @@ class getIntermediateOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -24170,11 +24891,11 @@ class getIntermediateOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype102, _size99) = iprot.readListBegin()
- for _i103 in xrange(_size99):
- _elem104 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem104.read(iprot)
- self.success.append(_elem104)
+ (_etype118, _size115) = iprot.readListBegin()
+ for _i119 in xrange(_size115):
+ _elem120 = apache.airavata.model.job.ttypes.JobModel()
+ _elem120.read(iprot)
+ self.success.append(_elem120)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24217,12 +24938,12 @@ class getIntermediateOutputs_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getIntermediateOutputs_result')
+ oprot.writeStructBegin('getJobDetails_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter105 in self.success:
- iter105.write(oprot)
+ for iter121 in self.success:
+ iter121.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24273,22 +24994,25 @@ class getIntermediateOutputs_result:
def __ne__(self, other):
return not (self == other)
-class getJobStatuses_args:
+class cloneExperiment_args:
"""
Attributes:
- authzToken
- - airavataExperimentId
+ - existingExperimentID
+ - newExperimentName
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
+ (2, TType.STRING, 'existingExperimentID', None, None, ), # 2
+ (3, TType.STRING, 'newExperimentName', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None,):
+ def __init__(self, authzToken=None, existingExperimentID=None, newExperimentName=None,):
self.authzToken = authzToken
- self.airavataExperimentId = airavataExperimentId
+ self.existingExperimentID = existingExperimentID
+ self.newExperimentName = newExperimentName
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -24307,7 +25031,12 @@ class getJobStatuses_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.airavataExperimentId = iprot.readString()
+ self.existingExperimentID = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRING:
+ self.newExperimentName = iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -24319,14 +25048,18 @@ class getJobStatuses_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getJobStatuses_args')
+ oprot.writeStructBegin('cloneExperiment_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.airavataExperimentId is not None:
- oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
- oprot.writeString(self.airavataExperimentId)
+ if self.existingExperimentID is not None:
+ oprot.writeFieldBegin('existingExperimentID', TType.STRING, 2)
+ oprot.writeString(self.existingExperimentID)
+ oprot.writeFieldEnd()
+ if self.newExperimentName is not None:
+ oprot.writeFieldBegin('newExperimentName', TType.STRING, 3)
+ oprot.writeString(self.newExperimentName)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -24334,15 +25067,14 @@ class getJobStatuses_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.airavataExperimentId is None:
- raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.airavataExperimentId)
+ value = (value * 31) ^ hash(self.existingExperimentID)
+ value = (value * 31) ^ hash(self.newExperimentName)
return value
def __repr__(self):
@@ -24356,7 +25088,7 @@ class getJobStatuses_args:
def __ne__(self, other):
return not (self == other)
-class getJobStatuses_result:
+class cloneExperiment_result:
"""
Attributes:
- success
@@ -24368,7 +25100,7 @@ class getJobStatuses_result:
"""
thrift_spec = (
- (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec)), None, ), # 0
+ (0, TType.STRING, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -24394,15 +25126,8 @@ class getJobStatuses_result:
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.MAP:
- self.success = {}
- (_ktype107, _vtype108, _size106 ) = iprot.readMapBegin()
- for _i110 in xrange(_size106):
- _key111 = iprot.readString()
- _val112 = apache.airavata.model.status.ttypes.JobStatus()
- _val112.read(iprot)
- self.success[_key111] = _val112
- iprot.readMapEnd()
+ if ftype == TType.STRING:
+ self.success = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -24444,14 +25169,10 @@ class getJobStatuses_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getJobStatuses_result')
+ oprot.writeStructBegin('cloneExperiment_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.MAP, 0)
- oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
- for kiter113,viter114 in self.success.items():
- oprot.writeString(kiter113)
- viter114.write(oprot)
- oprot.writeMapEnd()
+ oprot.writeFieldBegin('success', TType.STRING, 0)
+ oprot.writeString(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -24501,22 +25222,25 @@ class getJobStatuses_result:
def __ne__(self, other):
return not (self == other)
-class getJobDetails_args:
+class terminateExperiment_args:
"""
Attributes:
- authzToken
- airavataExperimentId
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None, gatewayId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -24538,6 +25262,11 @@ class getJobDetails_args:
self.airavataExperimentId = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -24547,7 +25276,7 @@ class getJobDetails_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getJobDetails_args')
+ oprot.writeStructBegin('terminateExperiment_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -24556,14 +25285,16 @@ class getJobDetails_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.airavataExperimentId is None:
- raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
return
@@ -24571,6 +25302,7 @@ class getJobDetails_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
+ value = (value * 31) ^ hash(self.gatewayId)
return value
def __repr__(self):
@@ -24584,10 +25316,9 @@ class getJobDetails_args:
def __ne__(self, other):
return not (self == other)
-class getJobDetails_result:
+class terminateExperiment_result:
"""
Attributes:
- - success
- ire
- enf
- ace
@@ -24596,7 +25327,7 @@ class getJobDetails_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec)), None, ), # 0
+ None, # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -24604,8 +25335,7 @@ class getJobDetails_result:
(5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
)
- def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
- self.success = success
+ def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
self.ire = ire
self.enf = enf
self.ace = ace
@@ -24621,18 +25351,7 @@ class getJobDetails_result:
(fname, ftype, fid) = iprot.readFieldBegin()
if ftype == TType.STOP:
break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype118, _size115) = iprot.readListBegin()
- for _i119 in xrange(_size115):
- _elem120 = apache.airavata.model.job.ttypes.JobModel()
- _elem120.read(iprot)
- self.success.append(_elem120)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
+ if fid == 1:
if ftype == TType.STRUCT:
self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
self.ire.read(iprot)
@@ -24671,14 +25390,7 @@ class getJobDetails_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getJobDetails_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter121 in self.success:
- iter121.write(oprot)
- oprot.writeListEnd()
- oprot.writeFieldEnd()
+ oprot.writeStructBegin('terminateExperiment_result')
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
self.ire.write(oprot)
@@ -24708,7 +25420,6 @@ class getJobDetails_result:
def __hash__(self):
value = 17
- value = (value * 31) ^ hash(self.success)
value = (value * 31) ^ hash(self.ire)
value = (value * 31) ^ hash(self.enf)
value = (value * 31) ^ hash(self.ace)
@@ -24727,25 +25438,25 @@ class getJobDetails_result:
def __ne__(self, other):
return not (self == other)
-class cloneExperiment_args:
+class registerApplicationModule_args:
"""
Attributes:
- authzToken
- - existingExperimentID
- - newExperimentName
+ - gatewayId
+ - applicationModule
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'existingExperimentID', None, None, ), # 2
- (3, TType.STRING, 'newExperimentName', None, None, ), # 3
+ (2, TType.STRING, 'gatewayId', None, None, ), # 2
+ (3, TType.STRUCT, 'applicationModule', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, existingExperimentID=None, newExperimentName=None,):
+ def __init__(self, authzToken=None, gatewayId=None, applicationModule=None,):
self.authzToken = authzToken
- self.existingExperimentID = existingExperimentID
- self.newExperimentName = newExperimentName
+ self.gatewayId = gatewayId
+ self.applicationModule = applicationModule
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -24764,12 +25475,13 @@ class cloneExperiment_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.existingExperimentID = iprot.readString()
+ self.gatewayId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
- if ftype == TType.STRING:
- self.newExperimentName = iprot.readString()
+ if ftype == TType.STRUCT:
+ self.applicationModule = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ self.applicationModule.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -24781,18 +25493,18 @@ class cloneExperiment_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('cloneExperiment_args')
+ oprot.writeStructBegin('registerApplicationModule_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.existingExperimentID is not None:
- oprot.writeFieldBegin('existingExperimentID', TType.STRING, 2)
- oprot.writeString(self.existingExperimentID)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+ oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
- if self.newExperimentName is not None:
- oprot.writeFieldBegin('newExperimentName', TType.STRING, 3)
- oprot.writeString(self.newExperimentName)
+ if self.applicationModule is not None:
+ oprot.writeFieldBegin('applicationModule', TType.STRUCT, 3)
+ self.applicationModule.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -24800,14 +25512,18 @@ class cloneExperiment_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
+ if self.applicationModule is None:
+ raise TProtocol.TProtocolException(message='Required field applicationModule is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.existingExperimentID)
- value = (value * 31) ^ hash(self.newExperimentName)
+ value = (value * 31) ^ hash(self.gatewayId)
+ value = (value * 31) ^ hash(self.applicationModule)
return value
def __repr__(self):
@@ -24821,12 +25537,11 @@ class cloneExperiment_args:
def __ne__(self, other):
return not (self == other)
-class cloneExperiment_result:
+class registerApplicationModule_result:
"""
Attributes:
- success
- ire
- - enf
- ace
- ase
- ae
@@ -24835,16 +25550,14 @@ class cloneExperiment_result:
thrift_spec = (
(0, TType.STRING, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
- (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
+ (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
- self.enf = enf
self.ace = ace
self.ase = ase
self.ae = ae
@@ -24871,23 +25584,17 @@ class cloneExperiment_result:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRUCT:
- self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
- self.enf.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
self.ace = apache.airavata.api.
<TRUNCATED>
[10/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
creating new branch for grouper integration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/70f85795
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/70f85795
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/70f85795
Branch: refs/heads/grouper-integration
Commit: 70f85795304e8ce719ffac50d41b5b31cf9fc800
Parents: 0bc5513
Author: scnakandala <su...@gmail.com>
Authored: Thu Jul 7 11:42:47 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jul 7 11:42:48 2016 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 5 +
.../server/handler/AiravataServerHandler.java | 358 +-
.../java/org/apache/airavata/api/Airavata.java | 42356 +++++++++--------
.../main/resources/lib/airavata/Airavata.cpp | 5557 ++-
.../src/main/resources/lib/airavata/Airavata.h | 532 +
.../lib/airavata/Airavata_server.skeleton.cpp | 24 +
.../resources/lib/airavata/airavata_api_types.h | 1 +
.../lib/airavata/airavata_data_models_types.h | 1 +
.../lib/airavata/workspace_model_types.cpp | 274 +-
.../lib/airavata/workspace_model_types.h | 52 +-
.../resources/lib/Airavata/API/Airavata.php | 11419 +++--
.../lib/Airavata/Model/Workspace/Types.php | 197 +-
.../lib/apache/airavata/api/Airavata-remote | 21 +
.../lib/apache/airavata/api/Airavata.py | 6300 +--
.../resources/lib/apache/airavata/api/ttypes.py | 1 +
.../lib/apache/airavata/model/ttypes.py | 1 +
.../apache/airavata/model/workspace/ttypes.py | 138 +-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 143 +-
.../apache/airavata/model/workspace/User.java | 620 +-
.../resources/airavata-default-xacml-policy.xml | 9 +-
.../utils/ThriftDataModelConversion.java | 1 +
pom.xml | 1 +
.../airavata-apis/airavata_api.thrift | 26 +
.../data-models/airavata_data_models.thrift | 1 +
.../workspace_model.thrift | 19 +-
.../group_manager_model.thrift | 53 +-
109 files changed, 39605 insertions(+), 28671 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 417f7c4..5231136 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -73,6 +73,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>group-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 1a7ee72..e43ff4a 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -33,6 +33,12 @@ import org.apache.airavata.credential.store.cpi.CredentialStoreService;
import org.apache.airavata.credential.store.datamodel.PasswordCredential;
import org.apache.airavata.credential.store.datamodel.SSHCredential;
import org.apache.airavata.credential.store.exception.CredentialStoreException;
+import org.apache.airavata.grouper.GroupManagerCPI;
+import org.apache.airavata.grouper.GroupManagerException;
+import org.apache.airavata.grouper.GroupManagerFactory;
+import org.apache.airavata.grouper.SubjectType;
+import org.apache.airavata.grouper.permission.PermissionAction;
+import org.apache.airavata.grouper.resource.Resource;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.Publisher;
import org.apache.airavata.messaging.core.PublisherFactory;
@@ -54,6 +60,8 @@ import org.apache.airavata.model.data.replica.DataProductModel;
import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
import org.apache.airavata.model.error.*;
import org.apache.airavata.model.experiment.*;
+import org.apache.airavata.model.group.ResourcePermissionType;
+import org.apache.airavata.model.group.ResourceType;
import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
import org.apache.airavata.model.messaging.event.MessageType;
@@ -619,6 +627,21 @@ public class AiravataServerHandler implements Airavata.Iface {
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
+
+ Project existingProject = (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
+ if(!authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(existingProject.getOwner())
+ || !authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(existingProject.getGatewayId())){
+ try {
+ if(!hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ existingProject.getProjectID(), ResourceType.PROJECT, ResourcePermissionType.WRITE)){
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
+
experimentCatalog.update(ExperimentCatalogModelType.PROJECT, updatedProject, projectId);
logger.debug("Airavata updated project with project Id : " + projectId );
} catch (RegistryException e) {
@@ -644,6 +667,21 @@ public class AiravataServerHandler implements Airavata.Iface {
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
+
+ Project existingProject = (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
+ if(!authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(existingProject.getOwner())
+ || !authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(existingProject.getGatewayId())){
+ try {
+ if(!hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ existingProject.getProjectID(), ResourceType.PROJECT, ResourcePermissionType.WRITE)){
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
+
experimentCatalog.remove(ExperimentCatalogModelType.PROJECT, projectId);
logger.debug("Airavata deleted project with project Id : " + projectId );
return true;
@@ -681,7 +719,24 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
logger.debug("Airavata retrieved project with project Id : " + projectId );
- return (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
+
+ Project project = (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
+ if(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(project.getOwner())
+ && authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(project.getGatewayId())){
+ return project;
+ }else{
+ try {
+ if(hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ project.getProjectID(), ResourceType.PROJECT, ResourcePermissionType.READ)){
+ return project;
+ }else {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
} catch (RegistryException e) {
logger.error("Error while retrieving the project", e);
ProjectNotFoundException exception = new ProjectNotFoundException();
@@ -808,14 +863,18 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
- //FIXME - These accessible IDs should come from grouper
Map<String, String> temp = new HashMap();
temp.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
temp.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
- List<Object> allUserProjects = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, temp, -1,
- 0, Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
- List<String> accessibleProjIds = new ArrayList<>();
- allUserProjects.stream().forEach(e->accessibleProjIds.add(((Project) e).getProjectID()));
+ final List<String> accessibleProjIds = new ArrayList<>();
+ try{
+ accessibleProjIds.addAll(getAllAccessibleResourcesForUser(userName+"@"+gatewayId, ResourceType.PROJECT, ResourcePermissionType.READ));
+ }catch (Exception ex){
+ logger.error(ex.getMessage(), ex);
+ List<Object> allUserProjects = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, temp, -1,
+ 0, Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
+ allUserProjects.stream().forEach(e->accessibleProjIds.add(((Project) e).getProjectID()));
+ }
List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.PROJECT, accessibleProjIds,
regFilters, limit, offset, Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
@@ -896,14 +955,19 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
- //FIXME - These accessible IDs should come from grouper
Map<String, String> temp = new HashMap();
temp.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
temp.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- List<Object> allUserExperiments = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, temp, -1,
- 0, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- List<String> accessibleExpIds = new ArrayList<>();
- allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummaryModel) e).getExperimentId()));
+
+ final List<String> accessibleExpIds = new ArrayList<>();
+ try{
+ accessibleExpIds.addAll(getAllAccessibleResourcesForUser(userName + "@" + gatewayId, ResourceType.EXPERIMENT, ResourcePermissionType.READ));
+ }catch (Exception ex){
+ logger.error(ex.getMessage(), ex);
+ List<Object> allUserExperiments = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, temp, -1,
+ 0, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
+ allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummaryModel) e).getExperimentId()));
+ }
List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.EXPERIMENT,
accessibleExpIds, regFilters, limit,
@@ -992,6 +1056,21 @@ public class AiravataServerHandler implements Airavata.Iface {
exception.setMessage("Project does not exist in the system. Please provide a valid project ID...");
throw exception;
}
+
+ Project project = (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, projectId);
+ if(!authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(project.getOwner())
+ || !authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(project.getGatewayId())){
+ try {
+ if(!hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ project.getProjectID(), ResourceType.PROJECT, ResourcePermissionType.READ)){
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
+
List<ExperimentModel> experiments = new ArrayList<ExperimentModel>();
List<Object> list = experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT,
Constants.FieldConstants.ExperimentConstants.PROJECT_ID, projectId, limit, offset,
@@ -1168,6 +1247,20 @@ public class AiravataServerHandler implements Airavata.Iface {
throw new ExperimentNotFoundException("Requested experiment id " + experimentId + " does not exist in the system..");
}
ExperimentModel experimentModel = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
+
+ if(!authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(experimentModel.getUserName())
+ || !authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(experimentModel.getGatewayId())){
+ try {
+ if(! hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ experimentModel.getExperimentId(), ResourceType.EXPERIMENT, ResourcePermissionType.WRITE)){
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
+
if(!(experimentModel.getExperimentStatus().getState() == ExperimentState.CREATED)){
logger.error("Error while deleting the experiment");
throw new ExperimentCatalogException("Experiment is not in CREATED state. Hence cannot deleted. ID:"+ experimentId);
@@ -1210,7 +1303,23 @@ public class AiravataServerHandler implements Airavata.Iface {
@SecurityCheck
public ExperimentModel getExperiment(AuthzToken authzToken, String airavataExperimentId) throws InvalidRequestException,
ExperimentNotFoundException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
- return getExperimentInternal(airavataExperimentId);
+ ExperimentModel experimentModel = getExperimentInternal(airavataExperimentId);
+ if(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(experimentModel.getUserName())
+ && authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(experimentModel.getGatewayId())){
+ return experimentModel;
+ }else{
+ try {
+ if(hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ experimentModel.getExperimentId(), ResourceType.EXPERIMENT, ResourcePermissionType.READ)){
+ return experimentModel;
+ }else {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
}
/**
@@ -1336,6 +1445,21 @@ public class AiravataServerHandler implements Airavata.Iface {
logger.error(airavataExperimentId, "Update request failed, Experiment {} doesn't exist.", airavataExperimentId);
throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
}
+
+ ExperimentModel experimentModel = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId);
+ if(!authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME).equals(experimentModel.getUserName())
+ || !authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID).equals(experimentModel.getGatewayId())){
+ try {
+ if(! hasPermission(authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.USER_NAME)
+ +"@"+authzToken.getClaimsMap().get(org.apache.airavata.common.utils.Constants.GATEWAY_ID),
+ experimentModel.getExperimentId(), ResourceType.EXPERIMENT, ResourcePermissionType.WRITE)){
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ } catch (Exception e) {
+ throw new AuthorizationException("User does not have permission to access this resource");
+ }
+ }
+
ExperimentStatus experimentStatus = getExperimentStatusInternal(airavataExperimentId);
if (experimentStatus != null){
ExperimentState experimentState = experimentStatus.getState();
@@ -1370,7 +1494,13 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
}
- } catch (Exception e) {
+ } catch (RegistryException e) {
+ logger.error(airavataExperimentId, "Error while updating experiment", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while updating experiment. More info : " + e.getMessage());
+ throw exception;
+ } catch (AppCatalogException e) {
logger.error(airavataExperimentId, "Error while updating experiment", e);
AiravataSystemException exception = new AiravataSystemException();
exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
@@ -4241,6 +4371,208 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
+ /**
+ * Group Manager and Data Sharing Related API methods
+ *
+ * @param authzToken
+ * @param resourceId
+ * @param resourceType
+ * @param userPermissionList
+ */
+ @Override
+ @SecurityCheck
+ public boolean shareResourceWithUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ Map<String, ResourcePermissionType> userPermissionList) throws InvalidRequestException,
+ AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ try {
+ if(!isResourceExistsInGrouper(resourceId, resourceType)){
+ initializeResourceWithGrouper(resourceId, resourceType);
+ }
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ for(Map.Entry<String, ResourcePermissionType> entry : userPermissionList.entrySet()){
+ org.apache.airavata.grouper.resource.ResourceType gResouceType;
+ if(resourceType.equals(ResourceType.EXPERIMENT)){
+ gResouceType = org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT;
+ }else if(resourceType.equals(ResourceType.PROJECT)){
+ gResouceType = org.apache.airavata.grouper.resource.ResourceType.PROJECT;
+ }else{
+ //Unsupported data type
+ continue;
+ }
+
+ if(entry.getValue().equals(ResourcePermissionType.READ)){
+ groupManager.grantPermission(entry.getKey(), SubjectType.PERSON, resourceId, gResouceType, PermissionAction.READ);
+ }else if(entry.getValue().equals(ResourcePermissionType.WRITE)){
+ groupManager.grantPermission(entry.getKey(), SubjectType.PERSON, resourceId, gResouceType, PermissionAction.WRITE);
+ }else{
+ //Unsupported permission type
+ continue;
+ }
+ }
+ return true;
+ } catch (Exception e) {
+ String msg = "Error in sharing resource with users. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ logger.error(msg, e);
+ AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage(msg + " More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ @SecurityCheck
+ public boolean revokeSharingOfResourceFromUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType,
+ Map<String, ResourcePermissionType> userPermissionList) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ try {
+ if(!isResourceExistsInGrouper(resourceId, resourceType)){
+ initializeResourceWithGrouper(resourceId, resourceType);
+ }
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ for(Map.Entry<String, ResourcePermissionType> entry : userPermissionList.entrySet()){
+ org.apache.airavata.grouper.resource.ResourceType gResouceType;
+ if(resourceType.equals(ResourceType.EXPERIMENT)){
+ gResouceType = org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT;
+ }else if(resourceType.equals(ResourceType.PROJECT)){
+ gResouceType = org.apache.airavata.grouper.resource.ResourceType.PROJECT;
+ }else{
+ //Unsupported data type
+ continue;
+ }
+
+ if(entry.getValue().equals(ResourcePermissionType.READ)){
+ groupManager.revokePermission(entry.getKey(), SubjectType.PERSON, resourceId, gResouceType, PermissionAction.READ);
+ }else if(entry.getValue().equals(ResourcePermissionType.WRITE)){
+ groupManager.revokePermission(entry.getKey(), SubjectType.PERSON, resourceId, gResouceType, PermissionAction.WRITE);
+ }else{
+ //Unsupported permission type
+ continue;
+ }
+ }
+ return true;
+ } catch (Exception e) {
+ String msg = "Error in revoking access to resouce from users. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ logger.error(msg, e);
+ AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage(msg + " More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ @SecurityCheck
+ public List<String> getAllAccessibleUsers(AuthzToken authzToken, String resourceId, ResourceType resourceType, ResourcePermissionType permissionType) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ try {
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ org.apache.airavata.grouper.resource.ResourceType gResourceType;
+ if(resourceType.equals(ResourceType.PROJECT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.PROJECT;
+ }else if(resourceType.equals(ResourceType.EXPERIMENT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT;
+ }else{
+ throw new GroupManagerException("Unsupported Resource Type");
+ }
+
+ org.apache.airavata.grouper.permission.PermissionAction gPermissionType;
+ if(permissionType.equals(ResourcePermissionType.READ)){
+ gPermissionType = PermissionAction.READ;
+ } else if (permissionType.equals(ResourcePermissionType.WRITE)){
+ gPermissionType = PermissionAction.WRITE;
+ }else{
+ throw new GroupManagerException("Unsupported Permission Type");
+ }
+ List<String> accessibleUsers = new ArrayList<>();
+ accessibleUsers.addAll(groupManager.getAllAccessibleUsers(resourceId, gResourceType, gPermissionType));
+ return accessibleUsers;
+ } catch (Exception e) {
+ String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;
+ logger.error(msg, e);
+ AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage(msg + " More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ private void initializeResourceWithGrouper(String resourceId, ResourceType resourceType) throws RegistryException, GroupManagerException {
+ ExperimentCatalog experimentCatalog = RegistryFactory.getDefaultExpCatalog();
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ if(resourceType.equals(ResourceType.PROJECT)){
+ Project project = (Project) experimentCatalog.get(ExperimentCatalogModelType.PROJECT, resourceId);
+
+ Resource projectResource = new Resource(project.getProjectID(), org.apache.airavata.grouper.resource.ResourceType.PROJECT);
+ projectResource.setName(project.getName());
+ projectResource.setDescription(project.getDescription());
+ projectResource.setOwnerId(project.getOwner()+"@"+project.getGatewayId());
+ groupManager.createResource(projectResource);
+
+ }else if(resourceType.equals(ResourceType.EXPERIMENT)){
+ ExperimentModel experiment = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, resourceId);
+ Resource experimentResource = new Resource(experiment.getExperimentId(), org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT);
+ experimentResource.setName(experiment.getExperimentName());
+ experimentResource.setDescription(experiment.getDescription());
+ experimentResource.setParentResourceId(experiment.getProjectId());
+ experimentResource.setOwnerId(experiment.getUserName()+"@"+experiment.getGatewayId());
+ groupManager.createResource(experimentResource);
+ }
+ throw new GroupManagerException("Unsupported Resource Type");
+ }
+
+ private boolean isResourceExistsInGrouper(String resourceId, ResourceType resourceType) throws GroupManagerException {
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ if(resourceType.equals(ResourceType.PROJECT)){
+ return groupManager.isResourceRegistered(resourceId, org.apache.airavata.grouper.resource.ResourceType.PROJECT);
+ }else if(resourceType.equals(ResourceType.EXPERIMENT)){
+ return groupManager.isResourceRegistered(resourceId, org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT);
+ }
+ throw new GroupManagerException("Unsupported Resource Type");
+ }
+
+ private boolean hasPermission(String userId, String resourceId, ResourceType resourceType, ResourcePermissionType permissionType) throws GroupManagerException {
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ org.apache.airavata.grouper.resource.ResourceType gResourceType;
+ if(resourceType.equals(ResourceType.PROJECT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.PROJECT;
+ }else if(resourceType.equals(ResourceType.EXPERIMENT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT;
+ }else{
+ throw new GroupManagerException("Unsupported Resource Type");
+ }
+
+ org.apache.airavata.grouper.permission.PermissionAction gPermissionType;
+ if(permissionType.equals(ResourcePermissionType.READ)){
+ gPermissionType = PermissionAction.READ;
+ } else if (permissionType.equals(ResourcePermissionType.WRITE)){
+ gPermissionType = PermissionAction.WRITE;
+ }else{
+ throw new GroupManagerException("Unsupported Permission Type");
+ }
+ Set<String> accessibleUsers = groupManager.getAllAccessibleUsers(resourceId, gResourceType, gPermissionType);
+ return accessibleUsers.contains(userId);
+ }
+
+ private List<String> getAllAccessibleResourcesForUser(String userId, ResourceType resourceType, ResourcePermissionType permissionType) throws GroupManagerException {
+ GroupManagerCPI groupManager = GroupManagerFactory.getGroupManager();
+ org.apache.airavata.grouper.resource.ResourceType gResourceType;
+ if(resourceType.equals(ResourceType.PROJECT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.PROJECT;
+ }else if(resourceType.equals(ResourceType.EXPERIMENT)){
+ gResourceType = org.apache.airavata.grouper.resource.ResourceType.EXPERIMENT;
+ }else{
+ throw new GroupManagerException("Unsupported Resource Type");
+ }
+
+ org.apache.airavata.grouper.permission.PermissionAction gPermissionType;
+ if(permissionType.equals(ResourcePermissionType.READ)){
+ gPermissionType = PermissionAction.READ;
+ } else if (permissionType.equals(ResourcePermissionType.WRITE)){
+ gPermissionType = PermissionAction.WRITE;
+ }else{
+ throw new GroupManagerException("Unsupported Permission Type");
+ }
+
+ List<String> allAccessibleResources = groupManager.getAccessibleResourcesForUser(userId, gResourceType, gPermissionType);
+ return allAccessibleResources;
+ }
+
private CredentialStoreService.Client getCredentialStoreServiceClient() throws TException, ApplicationSettingsException {
final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
final String serverHost = ServerSettings.getCredentialStoreServerHost();
[02/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index 5faeaef..3ed3077 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index 8901f85..c76f795 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
index b0b3169..bc41613 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
index f1e97ec..32475fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
index 8b6da4b..e54a93e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index ace3c91..1e6c4e2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
index 367820d..d4aa5fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index 140c404..35039ee 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 714f267..1cf29e9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index 20fdd62..5238aed 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index 0ea390b..c42a616 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
index 006d391..98d5235 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index 5214e17..b8ac4dc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index 87a90c3..2615829 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index b6a4fcf..c3b1f2e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index ad5d994..4f26729 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index 01a1932..74c6a46 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index a46a3c6..4288f8b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 2858048..64b0f75 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 4286a11..9645612 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index a7fc645..be575ad 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index f455b3a..68995c5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index ab3a5f6..63c5770 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 0a13976..e017c4a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index ff2b2cb..ff357a2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 272f096..2c84a76 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index c493a32..90034ae 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index 5d7a764..832b792 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 3b09f70..e19e107 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,17 +51,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
private static final org.apache.thrift.protocol.TField PROJECT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("projectID", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)5);
- private static final org.apache.thrift.protocol.TField SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)6);
- private static final org.apache.thrift.protocol.TField SHARED_GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedGroups", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)6);
+ private static final org.apache.thrift.protocol.TField SHARED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedUsers", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField SHARED_GROUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedGroups", org.apache.thrift.protocol.TType.LIST, (short)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -71,6 +72,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
private String projectID; // required
private String owner; // required
+ private String gatewayId; // required
private String name; // required
private String description; // optional
private long creationTime; // optional
@@ -81,11 +83,12 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PROJECT_ID((short)1, "projectID"),
OWNER((short)2, "owner"),
- NAME((short)3, "name"),
- DESCRIPTION((short)4, "description"),
- CREATION_TIME((short)5, "creationTime"),
- SHARED_USERS((short)6, "sharedUsers"),
- SHARED_GROUPS((short)7, "sharedGroups");
+ GATEWAY_ID((short)3, "gatewayId"),
+ NAME((short)4, "name"),
+ DESCRIPTION((short)5, "description"),
+ CREATION_TIME((short)6, "creationTime"),
+ SHARED_USERS((short)7, "sharedUsers"),
+ SHARED_GROUPS((short)8, "sharedGroups");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -104,15 +107,17 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
return PROJECT_ID;
case 2: // OWNER
return OWNER;
- case 3: // NAME
+ case 3: // GATEWAY_ID
+ return GATEWAY_ID;
+ case 4: // NAME
return NAME;
- case 4: // DESCRIPTION
+ case 5: // DESCRIPTION
return DESCRIPTION;
- case 5: // CREATION_TIME
+ case 6: // CREATION_TIME
return CREATION_TIME;
- case 6: // SHARED_USERS
+ case 7: // SHARED_USERS
return SHARED_USERS;
- case 7: // SHARED_GROUPS
+ case 8: // SHARED_GROUPS
return SHARED_GROUPS;
default:
return null;
@@ -164,6 +169,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.OWNER, new org.apache.thrift.meta_data.FieldMetaData("owner", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -188,11 +195,13 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
public Project(
String projectID,
String owner,
+ String gatewayId,
String name)
{
this();
this.projectID = projectID;
this.owner = owner;
+ this.gatewayId = gatewayId;
this.name = name;
}
@@ -207,6 +216,9 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
if (other.isSetOwner()) {
this.owner = other.owner;
}
+ if (other.isSetGatewayId()) {
+ this.gatewayId = other.gatewayId;
+ }
if (other.isSetName()) {
this.name = other.name;
}
@@ -233,6 +245,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
this.projectID = "DO_NOT_SET_AT_CLIENTS";
this.owner = null;
+ this.gatewayId = null;
this.name = null;
this.description = null;
setCreationTimeIsSet(false);
@@ -287,6 +300,29 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
}
}
+ public String getGatewayId() {
+ return this.gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ public void unsetGatewayId() {
+ this.gatewayId = null;
+ }
+
+ /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayId() {
+ return this.gatewayId != null;
+ }
+
+ public void setGatewayIdIsSet(boolean value) {
+ if (!value) {
+ this.gatewayId = null;
+ }
+ }
+
public String getName() {
return this.name;
}
@@ -449,6 +485,14 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
}
break;
+ case GATEWAY_ID:
+ if (value == null) {
+ unsetGatewayId();
+ } else {
+ setGatewayId((String)value);
+ }
+ break;
+
case NAME:
if (value == null) {
unsetName();
@@ -500,6 +544,9 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
case OWNER:
return getOwner();
+ case GATEWAY_ID:
+ return getGatewayId();
+
case NAME:
return getName();
@@ -530,6 +577,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
return isSetProjectID();
case OWNER:
return isSetOwner();
+ case GATEWAY_ID:
+ return isSetGatewayId();
case NAME:
return isSetName();
case DESCRIPTION:
@@ -575,6 +624,15 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
return false;
}
+ boolean this_present_gatewayId = true && this.isSetGatewayId();
+ boolean that_present_gatewayId = true && that.isSetGatewayId();
+ if (this_present_gatewayId || that_present_gatewayId) {
+ if (!(this_present_gatewayId && that_present_gatewayId))
+ return false;
+ if (!this.gatewayId.equals(that.gatewayId))
+ return false;
+ }
+
boolean this_present_name = true && this.isSetName();
boolean that_present_name = true && that.isSetName();
if (this_present_name || that_present_name) {
@@ -637,6 +695,11 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
if (present_owner)
list.add(owner);
+ boolean present_gatewayId = true && (isSetGatewayId());
+ list.add(present_gatewayId);
+ if (present_gatewayId)
+ list.add(gatewayId);
+
boolean present_name = true && (isSetName());
list.add(present_name);
if (present_name)
@@ -693,6 +756,16 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) {
return lastComparison;
@@ -779,6 +852,14 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
}
first = false;
if (!first) sb.append(", ");
+ sb.append("gatewayId:");
+ if (this.gatewayId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("name:");
if (this.name == null) {
sb.append("null");
@@ -836,6 +917,10 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
throw new org.apache.thrift.protocol.TProtocolException("Required field 'owner' is unset! Struct:" + toString());
}
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
+ }
+
if (!isSetName()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
}
@@ -895,7 +980,15 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // NAME
+ case 3: // GATEWAY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayId = iprot.readString();
+ struct.setGatewayIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
@@ -903,7 +996,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // DESCRIPTION
+ case 5: // DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.description = iprot.readString();
struct.setDescriptionIsSet(true);
@@ -911,7 +1004,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // CREATION_TIME
+ case 6: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -919,7 +1012,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // SHARED_USERS
+ case 7: // SHARED_USERS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -937,7 +1030,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // SHARED_GROUPS
+ case 8: // SHARED_GROUPS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -978,6 +1071,11 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
oprot.writeString(struct.owner);
oprot.writeFieldEnd();
}
+ if (struct.gatewayId != null) {
+ oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.gatewayId);
+ oprot.writeFieldEnd();
+ }
if (struct.name != null) {
oprot.writeFieldBegin(NAME_FIELD_DESC);
oprot.writeString(struct.name);
@@ -1042,6 +1140,7 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.projectID);
oprot.writeString(struct.owner);
+ oprot.writeString(struct.gatewayId);
oprot.writeString(struct.name);
BitSet optionals = new BitSet();
if (struct.isSetDescription()) {
@@ -1090,6 +1189,8 @@ public class Project implements org.apache.thrift.TBase<Project, Project._Fields
struct.setProjectIDIsSet(true);
struct.owner = iprot.readString();
struct.setOwnerIsSet(true);
+ struct.gatewayId = iprot.readString();
+ struct.setGatewayIdIsSet(true);
struct.name = iprot.readString();
struct.setNameIsSet(true);
BitSet incoming = iprot.readBitSet(4);
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index ddf6b84..c18a498 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,12 +51,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
- private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField GROUP_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("groupList", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField AIRAVATA_INTERNAL_USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataInternalUserId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstName", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastName", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("email", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -64,13 +68,21 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
schemes.put(TupleScheme.class, new UserTupleSchemeFactory());
}
- private String userName; // required
- private List<Group> groupList; // optional
+ private String airavataInternalUserId; // required
+ private String userName; // optional
+ private String gatewayId; // required
+ private String firstName; // optional
+ private String lastName; // optional
+ private String email; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- USER_NAME((short)1, "userName"),
- GROUP_LIST((short)2, "groupList");
+ AIRAVATA_INTERNAL_USER_ID((short)1, "airavataInternalUserId"),
+ USER_NAME((short)2, "userName"),
+ GATEWAY_ID((short)3, "gatewayId"),
+ FIRST_NAME((short)4, "firstName"),
+ LAST_NAME((short)5, "lastName"),
+ EMAIL((short)6, "email");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -85,10 +97,18 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // USER_NAME
+ case 1: // AIRAVATA_INTERNAL_USER_ID
+ return AIRAVATA_INTERNAL_USER_ID;
+ case 2: // USER_NAME
return USER_NAME;
- case 2: // GROUP_LIST
- return GROUP_LIST;
+ case 3: // GATEWAY_ID
+ return GATEWAY_ID;
+ case 4: // FIRST_NAME
+ return FIRST_NAME;
+ case 5: // LAST_NAME
+ return LAST_NAME;
+ case 6: // EMAIL
+ return EMAIL;
default:
return null;
}
@@ -129,42 +149,61 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.GROUP_LIST};
+ private static final _Fields optionals[] = {_Fields.USER_NAME,_Fields.FIRST_NAME,_Fields.LAST_NAME,_Fields.EMAIL};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.AIRAVATA_INTERNAL_USER_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataInternalUserId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("lastName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.EMAIL, new org.apache.thrift.meta_data.FieldMetaData("email", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GROUP_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupList", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Group.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(User.class, metaDataMap);
}
public User() {
+ this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+
}
public User(
- String userName)
+ String airavataInternalUserId,
+ String gatewayId)
{
this();
- this.userName = userName;
+ this.airavataInternalUserId = airavataInternalUserId;
+ this.gatewayId = gatewayId;
}
/**
* Performs a deep copy on <i>other</i>.
*/
public User(User other) {
+ if (other.isSetAiravataInternalUserId()) {
+ this.airavataInternalUserId = other.airavataInternalUserId;
+ }
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGroupList()) {
- List<Group> __this__groupList = new ArrayList<Group>(other.groupList.size());
- for (Group other_element : other.groupList) {
- __this__groupList.add(new Group(other_element));
- }
- this.groupList = __this__groupList;
+ if (other.isSetGatewayId()) {
+ this.gatewayId = other.gatewayId;
+ }
+ if (other.isSetFirstName()) {
+ this.firstName = other.firstName;
+ }
+ if (other.isSetLastName()) {
+ this.lastName = other.lastName;
+ }
+ if (other.isSetEmail()) {
+ this.email = other.email;
}
}
@@ -174,8 +213,36 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
@Override
public void clear() {
+ this.airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+
this.userName = null;
- this.groupList = null;
+ this.gatewayId = null;
+ this.firstName = null;
+ this.lastName = null;
+ this.email = null;
+ }
+
+ public String getAiravataInternalUserId() {
+ return this.airavataInternalUserId;
+ }
+
+ public void setAiravataInternalUserId(String airavataInternalUserId) {
+ this.airavataInternalUserId = airavataInternalUserId;
+ }
+
+ public void unsetAiravataInternalUserId() {
+ this.airavataInternalUserId = null;
+ }
+
+ /** Returns true if field airavataInternalUserId is set (has been assigned a value) and false otherwise */
+ public boolean isSetAiravataInternalUserId() {
+ return this.airavataInternalUserId != null;
+ }
+
+ public void setAiravataInternalUserIdIsSet(boolean value) {
+ if (!value) {
+ this.airavataInternalUserId = null;
+ }
}
public String getUserName() {
@@ -201,46 +268,108 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
}
}
- public int getGroupListSize() {
- return (this.groupList == null) ? 0 : this.groupList.size();
+ public String getGatewayId() {
+ return this.gatewayId;
}
- public java.util.Iterator<Group> getGroupListIterator() {
- return (this.groupList == null) ? null : this.groupList.iterator();
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
}
- public void addToGroupList(Group elem) {
- if (this.groupList == null) {
- this.groupList = new ArrayList<Group>();
+ public void unsetGatewayId() {
+ this.gatewayId = null;
+ }
+
+ /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayId() {
+ return this.gatewayId != null;
+ }
+
+ public void setGatewayIdIsSet(boolean value) {
+ if (!value) {
+ this.gatewayId = null;
}
- this.groupList.add(elem);
}
- public List<Group> getGroupList() {
- return this.groupList;
+ public String getFirstName() {
+ return this.firstName;
}
- public void setGroupList(List<Group> groupList) {
- this.groupList = groupList;
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
}
- public void unsetGroupList() {
- this.groupList = null;
+ public void unsetFirstName() {
+ this.firstName = null;
}
- /** Returns true if field groupList is set (has been assigned a value) and false otherwise */
- public boolean isSetGroupList() {
- return this.groupList != null;
+ /** Returns true if field firstName is set (has been assigned a value) and false otherwise */
+ public boolean isSetFirstName() {
+ return this.firstName != null;
}
- public void setGroupListIsSet(boolean value) {
+ public void setFirstNameIsSet(boolean value) {
if (!value) {
- this.groupList = null;
+ this.firstName = null;
+ }
+ }
+
+ public String getLastName() {
+ return this.lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public void unsetLastName() {
+ this.lastName = null;
+ }
+
+ /** Returns true if field lastName is set (has been assigned a value) and false otherwise */
+ public boolean isSetLastName() {
+ return this.lastName != null;
+ }
+
+ public void setLastNameIsSet(boolean value) {
+ if (!value) {
+ this.lastName = null;
+ }
+ }
+
+ public String getEmail() {
+ return this.email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public void unsetEmail() {
+ this.email = null;
+ }
+
+ /** Returns true if field email is set (has been assigned a value) and false otherwise */
+ public boolean isSetEmail() {
+ return this.email != null;
+ }
+
+ public void setEmailIsSet(boolean value) {
+ if (!value) {
+ this.email = null;
}
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case AIRAVATA_INTERNAL_USER_ID:
+ if (value == null) {
+ unsetAiravataInternalUserId();
+ } else {
+ setAiravataInternalUserId((String)value);
+ }
+ break;
+
case USER_NAME:
if (value == null) {
unsetUserName();
@@ -249,11 +378,35 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
}
break;
- case GROUP_LIST:
+ case GATEWAY_ID:
if (value == null) {
- unsetGroupList();
+ unsetGatewayId();
} else {
- setGroupList((List<Group>)value);
+ setGatewayId((String)value);
+ }
+ break;
+
+ case FIRST_NAME:
+ if (value == null) {
+ unsetFirstName();
+ } else {
+ setFirstName((String)value);
+ }
+ break;
+
+ case LAST_NAME:
+ if (value == null) {
+ unsetLastName();
+ } else {
+ setLastName((String)value);
+ }
+ break;
+
+ case EMAIL:
+ if (value == null) {
+ unsetEmail();
+ } else {
+ setEmail((String)value);
}
break;
@@ -262,11 +415,23 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
public Object getFieldValue(_Fields field) {
switch (field) {
+ case AIRAVATA_INTERNAL_USER_ID:
+ return getAiravataInternalUserId();
+
case USER_NAME:
return getUserName();
- case GROUP_LIST:
- return getGroupList();
+ case GATEWAY_ID:
+ return getGatewayId();
+
+ case FIRST_NAME:
+ return getFirstName();
+
+ case LAST_NAME:
+ return getLastName();
+
+ case EMAIL:
+ return getEmail();
}
throw new IllegalStateException();
@@ -279,10 +444,18 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
}
switch (field) {
+ case AIRAVATA_INTERNAL_USER_ID:
+ return isSetAiravataInternalUserId();
case USER_NAME:
return isSetUserName();
- case GROUP_LIST:
- return isSetGroupList();
+ case GATEWAY_ID:
+ return isSetGatewayId();
+ case FIRST_NAME:
+ return isSetFirstName();
+ case LAST_NAME:
+ return isSetLastName();
+ case EMAIL:
+ return isSetEmail();
}
throw new IllegalStateException();
}
@@ -300,6 +473,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
if (that == null)
return false;
+ boolean this_present_airavataInternalUserId = true && this.isSetAiravataInternalUserId();
+ boolean that_present_airavataInternalUserId = true && that.isSetAiravataInternalUserId();
+ if (this_present_airavataInternalUserId || that_present_airavataInternalUserId) {
+ if (!(this_present_airavataInternalUserId && that_present_airavataInternalUserId))
+ return false;
+ if (!this.airavataInternalUserId.equals(that.airavataInternalUserId))
+ return false;
+ }
+
boolean this_present_userName = true && this.isSetUserName();
boolean that_present_userName = true && that.isSetUserName();
if (this_present_userName || that_present_userName) {
@@ -309,12 +491,39 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return false;
}
- boolean this_present_groupList = true && this.isSetGroupList();
- boolean that_present_groupList = true && that.isSetGroupList();
- if (this_present_groupList || that_present_groupList) {
- if (!(this_present_groupList && that_present_groupList))
+ boolean this_present_gatewayId = true && this.isSetGatewayId();
+ boolean that_present_gatewayId = true && that.isSetGatewayId();
+ if (this_present_gatewayId || that_present_gatewayId) {
+ if (!(this_present_gatewayId && that_present_gatewayId))
+ return false;
+ if (!this.gatewayId.equals(that.gatewayId))
+ return false;
+ }
+
+ boolean this_present_firstName = true && this.isSetFirstName();
+ boolean that_present_firstName = true && that.isSetFirstName();
+ if (this_present_firstName || that_present_firstName) {
+ if (!(this_present_firstName && that_present_firstName))
+ return false;
+ if (!this.firstName.equals(that.firstName))
+ return false;
+ }
+
+ boolean this_present_lastName = true && this.isSetLastName();
+ boolean that_present_lastName = true && that.isSetLastName();
+ if (this_present_lastName || that_present_lastName) {
+ if (!(this_present_lastName && that_present_lastName))
+ return false;
+ if (!this.lastName.equals(that.lastName))
+ return false;
+ }
+
+ boolean this_present_email = true && this.isSetEmail();
+ boolean that_present_email = true && that.isSetEmail();
+ if (this_present_email || that_present_email) {
+ if (!(this_present_email && that_present_email))
return false;
- if (!this.groupList.equals(that.groupList))
+ if (!this.email.equals(that.email))
return false;
}
@@ -325,15 +534,35 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
public int hashCode() {
List<Object> list = new ArrayList<Object>();
+ boolean present_airavataInternalUserId = true && (isSetAiravataInternalUserId());
+ list.add(present_airavataInternalUserId);
+ if (present_airavataInternalUserId)
+ list.add(airavataInternalUserId);
+
boolean present_userName = true && (isSetUserName());
list.add(present_userName);
if (present_userName)
list.add(userName);
- boolean present_groupList = true && (isSetGroupList());
- list.add(present_groupList);
- if (present_groupList)
- list.add(groupList);
+ boolean present_gatewayId = true && (isSetGatewayId());
+ list.add(present_gatewayId);
+ if (present_gatewayId)
+ list.add(gatewayId);
+
+ boolean present_firstName = true && (isSetFirstName());
+ list.add(present_firstName);
+ if (present_firstName)
+ list.add(firstName);
+
+ boolean present_lastName = true && (isSetLastName());
+ list.add(present_lastName);
+ if (present_lastName)
+ list.add(lastName);
+
+ boolean present_email = true && (isSetEmail());
+ list.add(present_email);
+ if (present_email)
+ list.add(email);
return list.hashCode();
}
@@ -346,6 +575,16 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetAiravataInternalUserId()).compareTo(other.isSetAiravataInternalUserId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAiravataInternalUserId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.airavataInternalUserId, other.airavataInternalUserId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName());
if (lastComparison != 0) {
return lastComparison;
@@ -356,12 +595,42 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGroupList()).compareTo(other.isSetGroupList());
+ lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetGroupList()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupList, other.groupList);
+ if (isSetFirstName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLastName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetEmail()).compareTo(other.isSetEmail());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetEmail()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.email, other.email);
if (lastComparison != 0) {
return lastComparison;
}
@@ -386,20 +655,58 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
StringBuilder sb = new StringBuilder("User(");
boolean first = true;
- sb.append("userName:");
- if (this.userName == null) {
+ sb.append("airavataInternalUserId:");
+ if (this.airavataInternalUserId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.airavataInternalUserId);
+ }
+ first = false;
+ if (isSetUserName()) {
+ if (!first) sb.append(", ");
+ sb.append("userName:");
+ if (this.userName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.userName);
+ }
+ first = false;
+ }
+ if (!first) sb.append(", ");
+ sb.append("gatewayId:");
+ if (this.gatewayId == null) {
sb.append("null");
} else {
- sb.append(this.userName);
+ sb.append(this.gatewayId);
}
first = false;
- if (isSetGroupList()) {
+ if (isSetFirstName()) {
+ if (!first) sb.append(", ");
+ sb.append("firstName:");
+ if (this.firstName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.firstName);
+ }
+ first = false;
+ }
+ if (isSetLastName()) {
+ if (!first) sb.append(", ");
+ sb.append("lastName:");
+ if (this.lastName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.lastName);
+ }
+ first = false;
+ }
+ if (isSetEmail()) {
if (!first) sb.append(", ");
- sb.append("groupList:");
- if (this.groupList == null) {
+ sb.append("email:");
+ if (this.email == null) {
sb.append("null");
} else {
- sb.append(this.groupList);
+ sb.append(this.email);
}
first = false;
}
@@ -409,8 +716,12 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetUserName()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
+ if (!isSetAiravataInternalUserId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataInternalUserId' is unset! Struct:" + toString());
+ }
+
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
// check for sub-struct validity
@@ -450,7 +761,15 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
break;
}
switch (schemeField.id) {
- case 1: // USER_NAME
+ case 1: // AIRAVATA_INTERNAL_USER_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.airavataInternalUserId = iprot.readString();
+ struct.setAiravataInternalUserIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
@@ -458,21 +777,34 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // GROUP_LIST
- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
- struct.groupList = new ArrayList<Group>(_list16.size);
- Group _elem17;
- for (int _i18 = 0; _i18 < _list16.size; ++_i18)
- {
- _elem17 = new Group();
- _elem17.read(iprot);
- struct.groupList.add(_elem17);
- }
- iprot.readListEnd();
- }
- struct.setGroupListIsSet(true);
+ case 3: // GATEWAY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayId = iprot.readString();
+ struct.setGatewayIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // FIRST_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.firstName = iprot.readString();
+ struct.setFirstNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // LAST_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.lastName = iprot.readString();
+ struct.setLastNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // EMAIL
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.email = iprot.readString();
+ struct.setEmailIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -490,22 +822,41 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.airavataInternalUserId != null) {
+ oprot.writeFieldBegin(AIRAVATA_INTERNAL_USER_ID_FIELD_DESC);
+ oprot.writeString(struct.airavataInternalUserId);
+ oprot.writeFieldEnd();
+ }
if (struct.userName != null) {
- oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
- oprot.writeString(struct.userName);
+ if (struct.isSetUserName()) {
+ oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.userName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayId != null) {
+ oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.gatewayId);
oprot.writeFieldEnd();
}
- if (struct.groupList != null) {
- if (struct.isSetGroupList()) {
- oprot.writeFieldBegin(GROUP_LIST_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.groupList.size()));
- for (Group _iter19 : struct.groupList)
- {
- _iter19.write(oprot);
- }
- oprot.writeListEnd();
- }
+ if (struct.firstName != null) {
+ if (struct.isSetFirstName()) {
+ oprot.writeFieldBegin(FIRST_NAME_FIELD_DESC);
+ oprot.writeString(struct.firstName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.lastName != null) {
+ if (struct.isSetLastName()) {
+ oprot.writeFieldBegin(LAST_NAME_FIELD_DESC);
+ oprot.writeString(struct.lastName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.email != null) {
+ if (struct.isSetEmail()) {
+ oprot.writeFieldBegin(EMAIL_FIELD_DESC);
+ oprot.writeString(struct.email);
oprot.writeFieldEnd();
}
}
@@ -526,42 +877,59 @@ public class User implements org.apache.thrift.TBase<User, User._Fields>, java.i
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, User struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.userName);
+ oprot.writeString(struct.airavataInternalUserId);
+ oprot.writeString(struct.gatewayId);
BitSet optionals = new BitSet();
- if (struct.isSetGroupList()) {
+ if (struct.isSetUserName()) {
optionals.set(0);
}
- oprot.writeBitSet(optionals, 1);
- if (struct.isSetGroupList()) {
- {
- oprot.writeI32(struct.groupList.size());
- for (Group _iter20 : struct.groupList)
- {
- _iter20.write(oprot);
- }
- }
+ if (struct.isSetFirstName()) {
+ optionals.set(1);
+ }
+ if (struct.isSetLastName()) {
+ optionals.set(2);
+ }
+ if (struct.isSetEmail()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
+ if (struct.isSetUserName()) {
+ oprot.writeString(struct.userName);
+ }
+ if (struct.isSetFirstName()) {
+ oprot.writeString(struct.firstName);
+ }
+ if (struct.isSetLastName()) {
+ oprot.writeString(struct.lastName);
+ }
+ if (struct.isSetEmail()) {
+ oprot.writeString(struct.email);
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, User struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.userName = iprot.readString();
- struct.setUserNameIsSet(true);
- BitSet incoming = iprot.readBitSet(1);
+ struct.airavataInternalUserId = iprot.readString();
+ struct.setAiravataInternalUserIdIsSet(true);
+ struct.gatewayId = iprot.readString();
+ struct.setGatewayIdIsSet(true);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
- {
- org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.groupList = new ArrayList<Group>(_list21.size);
- Group _elem22;
- for (int _i23 = 0; _i23 < _list21.size; ++_i23)
- {
- _elem22 = new Group();
- _elem22.read(iprot);
- struct.groupList.add(_elem22);
- }
- }
- struct.setGroupListIsSet(true);
+ struct.userName = iprot.readString();
+ struct.setUserNameIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.firstName = iprot.readString();
+ struct.setFirstNameIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.lastName = iprot.readString();
+ struct.setLastNameIsSet(true);
+ }
+ if (incoming.get(3)) {
+ struct.email = iprot.readString();
+ struct.setEmailIsSet(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
index 8fe92a7..426f5fe 100644
--- a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
+++ b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
@@ -90,6 +90,10 @@
/airavata/getWorkflow|
/airavata/getWorkflowTemplateId|
/airavata/isWorkflowExistWithName|
+/airavata/getAllUsersInGateway|
+/airavata/shareResourceWithUsers|
+/airavata/revokeSharingOfResourceFromUsers|
+/airavata/getAllAccessibleUsers|
/airavata/registerDataProduct|
/airavata/getDataProduct|
/airavata/registerReplicaLocation|
@@ -128,13 +132,11 @@
/airavata/getUserProjects|
/airavata/searchsearchProjects|
/airavata/searchExperiments|
-/airavata/getExperimentStatistics|
/airavata/getExperimentsInProject|
/airavata/getUserExperiments|
/airavata/createExperiment|
/airavata/deleteExperiment|
/airavata/getExperiment|
-/airavata/getDetailedExperimentTree|
/airavata/updateExperiment|
/airavata/updateExperimentConfiguration|
/airavata/updateResourceScheduleing|
@@ -159,6 +161,9 @@
/airavata/getWorkflowTemplateId|
/airavata/isWorkflowExistWithName|
/airavata/getAllUsersInGateway|
+/airavata/shareResourceWithUsers|
+/airavata/revokeSharingOfResourceFromUsers|
+/airavata/getAllAccessibleUsers|
/airavata/registerDataProduct|
/airavata/getDataProduct|
/airavata/registerReplicaLocation|
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index a95b85e..737746f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -63,6 +63,7 @@ public class ThriftDataModelConversion {
}
project.setDescription(pr.getDescription());
project.setOwner(pr.getWorker().getUser());
+ project.setGatewayId(pr.getGatewayId());
List<ProjectUserResource> projectUserList = pr.getProjectUserList();
List<String> sharedUsers = new ArrayList<String>();
if (projectUserList != null && !projectUserList.isEmpty()){
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b293588..db0db1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -561,6 +561,7 @@
<module>modules/server</module>
<module>modules/workflow</module>
<module>modules/test-suite</module>
+ <module>modules/group-manager</module>
<!-- Deprecated Modules-->
<!--<module>modules/integration-tests</module>-->
<!--<module>modules/workflow-model</module>-->
[06/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index cebfb90..946aaa7 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -3366,6 +3366,45 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function getChildDataProducts(\Airavata\Model\Security\AuthzToken $authzToken, $productUri);
+ /**
+ * Group Manager and Data Sharing Related API methods
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @param int $resourceType
+ * @param array $userPermissionList
+ * @return bool
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function shareResourceWithUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @param int $resourceType
+ * @param array $userPermissionList
+ * @return bool
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function revokeSharingOfResourceFromUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @param int $resourceType
+ * @param int $permissionType
+ * @return string[]
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getAllAccessibleUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, $permissionType);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -12481,280 +12520,215 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getChildDataProducts failed: unknown result");
}
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
+ public function shareResourceWithUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList)
+ {
+ $this->send_shareResourceWithUsers($authzToken, $resourceId, $resourceType, $userPermissionList);
+ return $this->recv_shareResourceWithUsers();
+ }
-class Airavata_getAPIVersion_args {
- static $_TSPEC;
+ public function send_shareResourceWithUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList)
+ {
+ $args = new \Airavata\API\Airavata_shareResourceWithUsers_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $args->resourceType = $resourceType;
+ $args->userPermissionList = $userPermissionList;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'shareResourceWithUsers', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('shareResourceWithUsers', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
+ public function recv_shareResourceWithUsers()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_shareResourceWithUsers_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'authzToken',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Security\AuthzToken',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
}
+ $result = new \Airavata\API\Airavata_shareResourceWithUsers_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("shareResourceWithUsers failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_args';
+ public function revokeSharingOfResourceFromUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList)
+ {
+ $this->send_revokeSharingOfResourceFromUsers($authzToken, $resourceId, $resourceType, $userPermissionList);
+ return $this->recv_revokeSharingOfResourceFromUsers();
}
- public function read($input)
+ public function send_revokeSharingOfResourceFromUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, array $userPermissionList)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_revokeSharingOfResourceFromUsers_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $args->resourceType = $resourceType;
+ $args->userPermissionList = $userPermissionList;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
{
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
+ thrift_protocol_write_binary($this->output_, 'revokeSharingOfResourceFromUsers', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args');
- if ($this->authzToken !== null) {
- if (!is_object($this->authzToken)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
- $xfer += $this->authzToken->write($output);
- $xfer += $output->writeFieldEnd();
+ else
+ {
+ $this->output_->writeMessageBegin('revokeSharingOfResourceFromUsers', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
}
-}
-
-class Airavata_getAPIVersion_result {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
+ public function recv_revokeSharingOfResourceFromUsers()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_revokeSharingOfResourceFromUsers_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRING,
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
}
+ $result = new \Airavata\API\Airavata_revokeSharingOfResourceFromUsers_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("revokeSharingOfResourceFromUsers failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_result';
+ public function getAllAccessibleUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, $permissionType)
+ {
+ $this->send_getAllAccessibleUsers($authzToken, $resourceId, $resourceType, $permissionType);
+ return $this->recv_getAllAccessibleUsers();
}
- public function read($input)
+ public function send_getAllAccessibleUsers(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $resourceType, $permissionType)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_getAllAccessibleUsers_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $args->resourceType = $resourceType;
+ $args->permissionType = $permissionType;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
{
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
+ thrift_protocol_write_binary($this->output_, 'getAllAccessibleUsers', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getAllAccessibleUsers', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- $xfer += $input->readStructEnd();
- return $xfer;
}
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
- if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
- $xfer += $output->writeFieldEnd();
+ public function recv_getAllAccessibleUsers()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllAccessibleUsers_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_getAllAccessibleUsers_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->success !== null) {
+ return $result->success;
}
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ire !== null) {
+ throw $result->ire;
}
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ace !== null) {
+ throw $result->ace;
}
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ase !== null) {
+ throw $result->ase;
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getAllAccessibleUsers failed: unknown result");
}
}
-class Airavata_isUserExists_args {
+// HELPER FUNCTIONS AND STRUCTURES
+
+class Airavata_getAPIVersion_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12764,31 +12738,17 @@ class Airavata_isUserExists_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
}
}
public function getName() {
- return 'Airavata_isUserExists_args';
+ return 'Airavata_getAPIVersion_args';
}
public function read($input)
@@ -12814,20 +12774,6 @@ class Airavata_isUserExists_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -12840,7 +12786,7 @@ class Airavata_isUserExists_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_args');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12849,16 +12795,6 @@ class Airavata_isUserExists_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -12866,11 +12802,11 @@ class Airavata_isUserExists_args {
}
-class Airavata_isUserExists_result {
+class Airavata_getAPIVersion_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -12895,7 +12831,7 @@ class Airavata_isUserExists_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -12939,7 +12875,7 @@ class Airavata_isUserExists_result {
}
public function getName() {
- return 'Airavata_isUserExists_result';
+ return 'Airavata_getAPIVersion_result';
}
public function read($input)
@@ -12958,8 +12894,8 @@ class Airavata_isUserExists_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -13008,10 +12944,10 @@ class Airavata_isUserExists_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_result');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13041,7 +12977,7 @@ class Airavata_isUserExists_result {
}
-class Airavata_addGateway_args {
+class Airavata_isUserExists_args {
static $_TSPEC;
/**
@@ -13049,9 +12985,13 @@ class Airavata_addGateway_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Workspace\Gateway
+ * @var string
*/
- public $gateway = null;
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13062,9 +13002,12 @@ class Airavata_addGateway_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
),
);
}
@@ -13072,14 +13015,17 @@ class Airavata_addGateway_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gateway'])) {
- $this->gateway = $vals['gateway'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
}
}
}
public function getName() {
- return 'Airavata_addGateway_args';
+ return 'Airavata_isUserExists_args';
}
public function read($input)
@@ -13106,9 +13052,15 @@ class Airavata_addGateway_args {
}
break;
case 2:
- if ($ftype == TType::STRUCT) {
- $this->gateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->gateway->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -13125,7 +13077,7 @@ class Airavata_addGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13134,12 +13086,14 @@ class Airavata_addGateway_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gateway !== null) {
- if (!is_object($this->gateway)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('gateway', TType::STRUCT, 2);
- $xfer += $this->gateway->write($output);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -13149,11 +13103,11 @@ class Airavata_addGateway_args {
}
-class Airavata_addGateway_result {
+class Airavata_isUserExists_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -13178,7 +13132,7 @@ class Airavata_addGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -13222,7 +13176,7 @@ class Airavata_addGateway_result {
}
public function getName() {
- return 'Airavata_addGateway_result';
+ return 'Airavata_isUserExists_result';
}
public function read($input)
@@ -13241,8 +13195,8 @@ class Airavata_addGateway_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -13291,10 +13245,10 @@ class Airavata_addGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13324,7 +13278,7 @@ class Airavata_addGateway_result {
}
-class Airavata_getAllUsersInGateway_args {
+class Airavata_addGateway_args {
static $_TSPEC;
/**
@@ -13332,9 +13286,9 @@ class Airavata_getAllUsersInGateway_args {
*/
public $authzToken = null;
/**
- * @var string
+ * @var \Airavata\Model\Workspace\Gateway
*/
- public $gatewayId = null;
+ public $gateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13345,8 +13299,9 @@ class Airavata_getAllUsersInGateway_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
+ 'var' => 'gateway',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
),
);
}
@@ -13354,14 +13309,14 @@ class Airavata_getAllUsersInGateway_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
+ if (isset($vals['gateway'])) {
+ $this->gateway = $vals['gateway'];
}
}
}
public function getName() {
- return 'Airavata_getAllUsersInGateway_args';
+ return 'Airavata_addGateway_args';
}
public function read($input)
@@ -13388,8 +13343,9 @@ class Airavata_getAllUsersInGateway_args {
}
break;
case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
+ if ($ftype == TType::STRUCT) {
+ $this->gateway = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->gateway->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -13406,7 +13362,7 @@ class Airavata_getAllUsersInGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_addGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13415,9 +13371,12 @@ class Airavata_getAllUsersInGateway_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
+ if ($this->gateway !== null) {
+ if (!is_object($this->gateway)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('gateway', TType::STRUCT, 2);
+ $xfer += $this->gateway->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -13427,11 +13386,11 @@ class Airavata_getAllUsersInGateway_args {
}
-class Airavata_getAllUsersInGateway_result {
+class Airavata_addGateway_result {
static $_TSPEC;
/**
- * @var string[]
+ * @var string
*/
public $success = null;
/**
@@ -13456,11 +13415,7 @@ class Airavata_getAllUsersInGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRING,
- 'elem' => array(
- 'type' => TType::STRING,
- ),
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -13504,7 +13459,7 @@ class Airavata_getAllUsersInGateway_result {
}
public function getName() {
- return 'Airavata_getAllUsersInGateway_result';
+ return 'Airavata_addGateway_result';
}
public function read($input)
@@ -13523,18 +13478,8 @@ class Airavata_getAllUsersInGateway_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
- {
- $elem5 = null;
- $xfer += $input->readString($elem5);
- $this->success []= $elem5;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -13583,22 +13528,10 @@ class Airavata_getAllUsersInGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_addGateway_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRING, count($this->success));
- {
- foreach ($this->success as $iter6)
- {
- $xfer += $output->writeString($iter6);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13628,7 +13561,7 @@ class Airavata_getAllUsersInGateway_result {
}
-class Airavata_updateGateway_args {
+class Airavata_getAllUsersInGateway_args {
static $_TSPEC;
/**
@@ -13639,10 +13572,6 @@ class Airavata_updateGateway_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $updatedGateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13656,11 +13585,6 @@ class Airavata_updateGateway_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'updatedGateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
);
}
if (is_array($vals)) {
@@ -13670,14 +13594,11 @@ class Airavata_updateGateway_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['updatedGateway'])) {
- $this->updatedGateway = $vals['updatedGateway'];
- }
}
}
public function getName() {
- return 'Airavata_updateGateway_args';
+ return 'Airavata_getAllUsersInGateway_args';
}
public function read($input)
@@ -13710,14 +13631,6 @@ class Airavata_updateGateway_args {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->updatedGateway->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13730,7 +13643,7 @@ class Airavata_updateGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13744,14 +13657,6 @@ class Airavata_updateGateway_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->updatedGateway !== null) {
- if (!is_object($this->updatedGateway)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
- $xfer += $this->updatedGateway->write($output);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13759,10 +13664,14 @@ class Airavata_updateGateway_args {
}
-class Airavata_updateGateway_result {
+class Airavata_getAllUsersInGateway_result {
static $_TSPEC;
/**
+ * @var string[]
+ */
+ public $success = null;
+ /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -13782,6 +13691,14 @@ class Airavata_updateGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -13805,6 +13722,9 @@ class Airavata_updateGateway_result {
);
}
if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -13821,7 +13741,7 @@ class Airavata_updateGateway_result {
}
public function getName() {
- return 'Airavata_updateGateway_result';
+ return 'Airavata_getAllUsersInGateway_result';
}
public function read($input)
@@ -13839,6 +13759,23 @@ class Airavata_updateGateway_result {
}
switch ($fid)
{
+ case 0:
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $xfer += $input->readString($elem5);
+ $this->success []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -13883,7 +13820,24 @@ class Airavata_updateGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_result');
+ if ($this->success !== null) {
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRING, count($this->success));
+ {
+ foreach ($this->success as $iter6)
+ {
+ $xfer += $output->writeString($iter6);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -13911,7 +13865,7 @@ class Airavata_updateGateway_result {
}
-class Airavata_getGateway_args {
+class Airavata_updateGateway_args {
static $_TSPEC;
/**
@@ -13922,6 +13876,10 @@ class Airavata_getGateway_args {
* @var string
*/
public $gatewayId = null;
+ /**
+ * @var \Airavata\Model\Workspace\Gateway
+ */
+ public $updatedGateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13935,6 +13893,11 @@ class Airavata_getGateway_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
+ 3 => array(
+ 'var' => 'updatedGateway',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
);
}
if (is_array($vals)) {
@@ -13944,11 +13907,14 @@ class Airavata_getGateway_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['updatedGateway'])) {
+ $this->updatedGateway = $vals['updatedGateway'];
+ }
}
}
public function getName() {
- return 'Airavata_getGateway_args';
+ return 'Airavata_updateGateway_args';
}
public function read($input)
@@ -13981,6 +13947,14 @@ class Airavata_getGateway_args {
$xfer += $input->skip($ftype);
}
break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->updatedGateway->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13993,7 +13967,7 @@ class Airavata_getGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14007,6 +13981,14 @@ class Airavata_getGateway_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->updatedGateway !== null) {
+ if (!is_object($this->updatedGateway)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
+ $xfer += $this->updatedGateway->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14014,14 +13996,10 @@ class Airavata_getGateway_args {
}
-class Airavata_getGateway_result {
+class Airavata_updateGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $success = null;
- /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -14041,11 +14019,6 @@ class Airavata_getGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -14069,9 +14042,6 @@ class Airavata_getGateway_result {
);
}
if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -14088,7 +14058,7 @@ class Airavata_getGateway_result {
}
public function getName() {
- return 'Airavata_getGateway_result';
+ return 'Airavata_updateGateway_result';
}
public function read($input)
@@ -14106,14 +14076,6 @@ class Airavata_getGateway_result {
}
switch ($fid)
{
- case 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->success->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -14158,15 +14120,7 @@ class Airavata_getGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_result');
- if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
- $xfer += $output->writeFieldEnd();
- }
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -14194,7 +14148,7 @@ class Airavata_getGateway_result {
}
-class Airavata_deleteGateway_args {
+class Airavata_getGateway_args {
static $_TSPEC;
/**
@@ -14231,7 +14185,7 @@ class Airavata_deleteGateway_args {
}
public function getName() {
- return 'Airavata_deleteGateway_args';
+ return 'Airavata_getGateway_args';
}
public function read($input)
@@ -14276,7 +14230,7 @@ class Airavata_deleteGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14297,11 +14251,11 @@ class Airavata_deleteGateway_args {
}
-class Airavata_deleteGateway_result {
+class Airavata_getGateway_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway
*/
public $success = null;
/**
@@ -14326,7 +14280,8 @@ class Airavata_deleteGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
),
1 => array(
'var' => 'ire',
@@ -14370,7 +14325,7 @@ class Airavata_deleteGateway_result {
}
public function getName() {
- return 'Airavata_deleteGateway_result';
+ return 'Airavata_getGateway_result';
}
public function read($input)
@@ -14389,8 +14344,9 @@ class Airavata_deleteGateway_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -14439,10 +14395,13 @@ class Airavata_deleteGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_object($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14472,13 +14431,17 @@ class Airavata_deleteGateway_result {
}
-class Airavata_getAllGateways_args {
+class Airavata_deleteGateway_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14488,17 +14451,24 @@ class Airavata_getAllGateways_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllGateways_args';
+ return 'Airavata_deleteGateway_args';
}
public function read($input)
@@ -14524,6 +14494,13 @@ class Airavata_getAllGateways_args {
$xfer += $input->skip($ftype);
}
break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14536,7 +14513,7 @@ class Airavata_getAllGateways_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14545,6 +14522,11 @@ class Airavata_getAllGateways_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14552,11 +14534,11 @@ class Airavata_getAllGateways_args {
}
-class Airavata_getAllGateways_result {
+class Airavata_deleteGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway[]
+ * @var bool
*/
public $success = null;
/**
@@ -14581,12 +14563,7 @@ class Airavata_getAllGateways_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -14630,7 +14607,7 @@ class Airavata_getAllGateways_result {
}
public function getName() {
- return 'Airavata_getAllGateways_result';
+ return 'Airavata_deleteGateway_result';
}
public function read($input)
@@ -14649,19 +14626,8 @@ class Airavata_getAllGateways_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size7 = 0;
- $_etype10 = 0;
- $xfer += $input->readListBegin($_etype10, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
- {
- $elem12 = null;
- $elem12 = new \Airavata\Model\Workspace\Gateway();
- $xfer += $elem12->read($input);
- $this->success []= $elem12;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -14710,22 +14676,10 @@ class Airavata_getAllGateways_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter13)
- {
- $xfer += $iter13->write($output);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14755,17 +14709,13 @@ class Airavata_getAllGateways_result {
}
-class Airavata_isGatewayExist_args {
+class Airavata_getAllGateways_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14775,24 +14725,17 @@ class Airavata_isGatewayExist_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
public function getName() {
- return 'Airavata_isGatewayExist_args';
+ return 'Airavata_getAllGateways_args';
}
public function read($input)
@@ -14818,13 +14761,6 @@ class Airavata_isGatewayExist_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14837,7 +14773,7 @@ class Airavata_isGatewayExist_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14846,11 +14782,6 @@ class Airavata_isGatewayExist_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14858,11 +14789,11 @@ class Airavata_isGatewayExist_args {
}
-class Airavata_isGatewayExist_result {
+class Airavata_getAllGateways_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway[]
*/
public $success = null;
/**
@@ -14887,7 +14818,12 @@ class Airavata_isGatewayExist_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
),
1 => array(
'var' => 'ire',
@@ -14931,7 +14867,7 @@ class Airavata_isGatewayExist_result {
}
public function getName() {
- return 'Airavata_isGatewayExist_result';
+ return 'Airavata_getAllGateways_result';
}
public function read($input)
@@ -14950,8 +14886,19 @@ class Airavata_isGatewayExist_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readListBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $elem12 = null;
+ $elem12 = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $elem12->read($input);
+ $this->success []= $elem12;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -15000,10 +14947,22 @@ class Airavata_isGatewayExist_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter13)
+ {
+ $xfer += $iter13->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15033,7 +14992,7 @@ class Airavata_isGatewayExist_result {
}
-class Airavata_createNotification_args {
+class Airavata_isGatewayExist_args {
static $_TSPEC;
/**
@@ -15041,9 +15000,9 @@ class Airavata_createNotification_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Workspace\Notification
+ * @var string
*/
- public $notification = null;
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15054,9 +15013,8 @@ class Airavata_createNotification_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'notification',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Notification',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
),
);
}
@@ -15064,14 +15022,14 @@ class Airavata_createNotification_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['notification'])) {
- $this->notification = $vals['notification'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
}
}
public function getName() {
- return 'Airavata_createNotification_args';
+ return 'Airavata_isGatewayExist_args';
}
public function read($input)
@@ -15098,9 +15056,8 @@ class Airavata_createNotification_args {
}
break;
case 2:
- if ($ftype == TType::STRUCT) {
- $this->notification = new \Airavata\Model\Workspace\Notification();
- $xfer += $this->notification->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -15117,7 +15074,7 @@ class Airavata_createNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15126,12 +15083,9 @@ class Airavata_createNotification_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->notification !== null) {
- if (!is_object($this->notification)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('notification', TType::STRUCT, 2);
- $xfer += $this->notification->write($output);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -15141,11 +15095,11 @@ class Airavata_createNotification_args {
}
-class Airavata_createNotification_result {
+class Airavata_isGatewayExist_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -15170,7 +15124,7 @@ class Airavata_createNotification_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -15214,7 +15168,7 @@ class Airavata_createNotification_result {
}
public function getName() {
- return 'Airavata_createNotification_result';
+ return 'Airavata_isGatewayExist_result';
}
public function read($input)
@@ -15233,8 +15187,8 @@ class Airavata_createNotification_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -15283,10 +15237,10 @@ class Airavata_createNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15316,7 +15270,7 @@ class Airavata_createNotification_result {
}
-class Airavata_updateNotification_args {
+class Airavata_createNotification_args {
static $_TSPEC;
/**
@@ -15354,7 +15308,7 @@ class Airavata_updateNotification_args {
}
public function getName() {
- return 'Airavata_updateNotification_args';
+ return 'Airavata_createNotification_args';
}
public function read($input)
@@ -15400,7 +15354,7 @@ class Airavata_updateNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_createNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15424,11 +15378,11 @@ class Airavata_updateNotification_args {
}
-class Airavata_updateNotification_result {
+class Airavata_createNotification_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -15453,7 +15407,7 @@ class Airavata_updateNotification_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -15497,7 +15451,7 @@ class Airavata_updateNotification_result {
}
public function getName() {
- return 'Airavata_updateNotification_result';
+ return 'Airavata_createNotification_result';
}
public function read($input)
@@ -15516,8 +15470,8 @@ class Airavata_updateNotification_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -15566,10 +15520,10 @@ class Airavata_updateNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_createNotification_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15599,7 +15553,7 @@ class Airavata_updateNotification_result {
}
-class Airavata_deleteNotification_args {
+class Airavata_updateNotification_args {
static $_TSPEC;
/**
@@ -15607,13 +15561,9 @@ class Airavata_deleteNotification_args {
*/
public $authzToken = null;
/**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
+ * @var \Airavata\Model\Workspace\Notification
*/
- public $notificationId = null;
+ public $notification = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15624,12 +15574,9 @@ class Airavata_deleteNotification_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'notificationId',
- 'type' => TType::STRING,
+ 'var' => 'notification',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Notification',
),
);
}
@@ -15637,17 +15584,14 @@ class Airavata_deleteNotification_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['notificationId'])) {
- $this->notificationId = $vals['notificationId'];
+ if (isset($vals['notification'])) {
+ $this->notification = $vals['notification'];
}
}
}
public function getName() {
- return 'Airavata_deleteNotification_args';
+ return 'Airavata_updateNotification_args';
}
public function read($input)
@@ -15674,15 +15618,9 @@ class Airavata_deleteNotification_args {
}
break;
case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->notificationId);
+ if ($ftype == TType::STRUCT) {
+ $this->notification = new \Airavata\Model\Workspace\Notification();
+ $xfer += $this->notification->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -15699,7 +15637,7 @@ class Airavata_deleteNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_updateNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15708,14 +15646,12 @@ class Airavata_deleteNotification_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->notificationId !== null) {
- $xfer += $output->writeFieldBegin('notificationId', TType::STRING, 3);
- $xfer += $output->writeString($this->notificationId);
+ if ($this->notification !== null) {
+ if (!is_object($this->notification)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('notification', TType::STRUCT, 2);
+ $xfer += $this->notification->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -15725,7 +15661,7 @@ class Airavata_deleteNotification_args {
}
-class Airavata_deleteNotification_result {
+class Airavata_updateNotification_result {
static $_TSPEC;
/**
@@ -15798,7 +15734,7 @@ class Airavata_deleteNotification_result {
}
public function getName() {
- return 'Airavata_deleteNotification_result';
+ return 'Airavata_updateNotification_result';
}
public function read($input)
@@ -15867,7 +15803,7 @@ class Airavata_deleteNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_updateNotification_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
$xfer += $output->writeBool($this->success);
@@ -15900,7 +15836,7 @@ class Airavata_deleteNotification_result {
}
-class Airavata_getNotification_args {
+class Airavata_deleteNotification_args {
static $_TSPEC;
/**
@@ -15948,7 +15884,7 @@ class Airavata_getNotification_args {
}
public function getName() {
- return 'Airavata_getNotification_args';
+ return 'Airavata_deleteNotification_args';
}
public function read($input)
@@ -16000,7 +15936,7 @@ class Airavata_getNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -16026,11 +15962,11 @@ class Airavata_getNotification_args {
}
-class Airavata_getNotification_result {
+class Airavata_deleteNotification_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Notification
+ * @var bool
*/
public $success = null;
/**
@@ -16055,8 +15991,7 @@ class Airavata_getNotification_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Notification',
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -16100,7 +16035,7 @@ class Airavata_getNotification_result {
}
public function getName() {
- return 'Airavata_getNotification_result';
+ return 'Airavata_deleteNotification_result';
}
public function read($input)
@@ -16119,9 +16054,8 @@ class Airavata_getNotification_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Notification();
- $xfer += $this->success->read($input);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -16170,13 +16104,10 @@ class Airavata_getNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteNotification_result');
if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -16206,7 +16137,7 @@ class Airavata_getNotification_result {
}
-class Airavata_getAllNotifications_args {
+class Airavata_getNotification_args {
static $_TSPEC;
/**
@@ -16217,6 +16148,10 @@ class Airavata_getAllNotifications_args {
* @var string
*/
public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $notificationId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -16230,6 +16165,10 @@ class Airavata_getAllNotifications_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
+ 3 => array(
+ 'var' => 'notificationId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -16239,11 +16178,14 @@ class Airavata_getAllNotifications_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['notificationId'])) {
+ $this->notificationId = $vals['notificationId'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllNotifications_args';
+ return 'Airavata_getNotification_args';
}
public function read($input)
@@ -16276,6 +16218,13 @@ class Airavata_getAllNotifications_args {
$xfer += $input->skip($ftype);
}
break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->notificationId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -16288,7 +16237,7 @@ class Airavata_getAllNotifications_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllNotifications_args');
+ $xfer += $output->writeStructBegin('Airavata_getNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -16302,6 +16251,11 @@ class Airavata_getAllNotifications_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->notificationId !== null) {
+ $xfer += $output->writeFieldBegin('notificationId', TType::STRING, 3);
+ $xfer += $output->writeString($this->notificationId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -16309,11 +16263,11 @@ class Airavata_getAllNotifications_args {
}
-class Airavata_getAllNotifications_result {
+class Airavata_getNotification_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Notification[]
+ * @var \Airavata\Model\Workspace\Notification
*/
public $success = null;
/**
@@ -16338,12 +16292,8 @@ class Airavata_getAllNotifications_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Notification',
- ),
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Notification',
),
1 => array(
'var' => 'ire',
@@ -16387,7 +16337,7 @@ class Airavata_getAllNotifications_result {
}
public function getName() {
- return 'Airavata_getAllNotifications_result';
+ return 'Airavata_getNotification_result';
}
public function read($input)
@@ -16406,19 +16356,9 @@ class Airavata_getAllNotifications_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size14 = 0;
- $_etype17 = 0;
- $xfer += $input->readListBegin($_etype17, $_size14);
- for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
- {
- $elem19 = null;
- $elem19 = new \Airavata\Model\Workspace\Notification();
- $xfer += $elem19->read($input);
- $this->success []= $elem19;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\Workspace\Notification();
+ $xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -16467,22 +16407,13 @@ class Airavata_getAllNotifications_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllNotifications_result');
+ $xfer += $output->writeStructBegin('Airavata_getNotification_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
+ if (!is_object($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter20)
- {
- $xfer += $iter20->write($output);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -16512,7 +16443,7 @@ class Airavata_getAllNotifications_result {
}
-class Airavata_generateAndRegisterSSHKeys_args {
+class Airavata_getAllNotifications_args {
static $_TSPEC;
/**
@@ -16523,10 +16454,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -16540,10 +16467,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -16553,14 +16476,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
}
}
public function getName() {
- return 'Airavata_generateAndRegisterSSHKeys_args';
+ return 'Airavata_getAllNotifications_args';
}
public function read($input)
@@ -16593,13 +16513,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -16612,7 +16525,7 @@ class Airavata_generateAndRegisterSSHKeys_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllNotifications_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -16626,11 +16539,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -16638,11 +16546,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
}
-class Airavata_generateAndRegisterSSHKeys_result {
+class Airavata_getAllNotifications_result {
static $_TSPEC;
/**
- * @var string
+ * @var \Airavata\Model\Workspace\Notification[]
*/
public $success = null;
/**
@@ -16657,13 +16565,22 @@ class Airavata_generateAndRegisterSSHKeys_result {
* @var \Airavata\API\Error\AiravataSystemException
*/
public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Notification',
+ ),
),
1 => array(
'var' => 'ire',
@@ -16680,6 +16597,11 @@ class Airavata_generateAndRegisterSSHKeys_result {
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AiravataSystemException',
),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
);
}
if (is_array($vals)) {
@@ -16695,11 +16617,14 @@ class Airavata_generateAndRegisterSSHKeys_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
}
}
public function getName() {
- return 'Airavata_generateAndRegisterSSHKeys_result';
+ return 'Airavata_getAllNotifications_result';
}
public function read($input)
@@ -16718,8 +16643,19 @@ class Airavata_generateAndRegisterSSHKeys_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size14 = 0;
+ $_etype17 = 0;
+ $xfer += $input->readListBegin($_etype17, $_size14);
+ for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
+ {
+ $elem19 = null;
+ $elem19 = new \Airavata\Model\Workspace\Notification();
+ $xfer += $elem19->read($input);
+ $this->success []= $elem19;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -16748,6 +16684,14 @@ class Airavata_generateAndRegisterSSHKeys_result {
$xfer += $input->skip($ftype);
}
break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -16760,10 +16704,22 @@ class Airavata_generateAndRegisterSSHKeys_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllNotifications_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter20)
+ {
+ $xfer += $iter20->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -16781,6 +16737,11 @@ class Airavata_generateAndRegisterSSHKeys_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -16788,7 +16749,7 @@ class Airavata_generateAndRegisterSSHKeys_result {
}
-class Airavata_registerPwdCredential_args {
+class Airavata_generateAndRegisterSSHKeys_args {
static $_TSPEC;
/**
@@ -16802,19 +16763,7 @@ class Airavata_registerPwdCredential_args {
/**
* @var string
*/
- public $portalUserName = null;
- /**
- * @var string
- */
- public $loginUserName = null;
- /**
- * @var string
- */
- public $password = null;
- /**
- * @var string
- */
- public $description = null;
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -16829,19 +16778,7 @@ class Airavata_registerPwdCredential_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'portalUserName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'loginUserName',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'password',
- 'type' => TType::STRING,
- ),
- 6 => array(
- 'var' => 'description',
+ 'var' => 'userName',
'type' => TType::STRING,
),
);
@@ -16853,23 +16790,14 @@ class Airavata_registerPwdCredential_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['portalUserName'])) {
- $this->portalUserName = $vals['portalUserName'];
- }
- if (isset($vals['loginUserName'])) {
- $this->loginUserName = $vals['loginUserName'];
- }
- if (isset($vals['password'])) {
- $this->password = $vals['password'];
- }
- if (isset($vals['description'])) {
- $this->description = $vals['description'];
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
}
}
}
public function getName() {
- return 'Airavata_registerPwdCredential_args';
+ return 'Airavata_generateAndRegisterSSHKeys_args';
}
public function read($input)
@@ -16904,28 +16832,7 @@ class Airavata_registerPwdCredential_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->portalUserName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->loginUserName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->password);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->description);
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -16942,7 +1
<TRUNCATED>
[08/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index b5d0ce3..bd093d6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -43574,6 +43574,1091 @@ uint32_t Airavata_getChildDataProducts_presult::read(::apache::thrift::protocol:
return xfer;
}
+
+Airavata_shareResourceWithUsers_args::~Airavata_shareResourceWithUsers_args() throw() {
+}
+
+
+uint32_t Airavata_shareResourceWithUsers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_authzToken = false;
+ bool isset_resourceId = false;
+ bool isset_resourceType = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->authzToken.read(iprot);
+ isset_authzToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->resourceId);
+ isset_resourceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast390;
+ xfer += iprot->readI32(ecast390);
+ this->resourceType = ( ::apache::airavata::model::group::ResourceType::type)ecast390;
+ isset_resourceType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->userPermissionList.clear();
+ uint32_t _size391;
+ ::apache::thrift::protocol::TType _ktype392;
+ ::apache::thrift::protocol::TType _vtype393;
+ xfer += iprot->readMapBegin(_ktype392, _vtype393, _size391);
+ uint32_t _i395;
+ for (_i395 = 0; _i395 < _size391; ++_i395)
+ {
+ std::string _key396;
+ xfer += iprot->readString(_key396);
+ ::apache::airavata::model::group::ResourcePermissionType::type& _val397 = this->userPermissionList[_key396];
+ int32_t ecast398;
+ xfer += iprot->readI32(ecast398);
+ _val397 = ( ::apache::airavata::model::group::ResourcePermissionType::type)ecast398;
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.userPermissionList = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_shareResourceWithUsers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_shareResourceWithUsers_args");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->resourceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)this->resourceType);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userPermissionList", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->userPermissionList.size()));
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> ::const_iterator _iter399;
+ for (_iter399 = this->userPermissionList.begin(); _iter399 != this->userPermissionList.end(); ++_iter399)
+ {
+ xfer += oprot->writeString(_iter399->first);
+ xfer += oprot->writeI32((int32_t)_iter399->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_shareResourceWithUsers_pargs::~Airavata_shareResourceWithUsers_pargs() throw() {
+}
+
+
+uint32_t Airavata_shareResourceWithUsers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_shareResourceWithUsers_pargs");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->resourceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)(*(this->resourceType)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userPermissionList", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->userPermissionList)).size()));
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> ::const_iterator _iter400;
+ for (_iter400 = (*(this->userPermissionList)).begin(); _iter400 != (*(this->userPermissionList)).end(); ++_iter400)
+ {
+ xfer += oprot->writeString(_iter400->first);
+ xfer += oprot->writeI32((int32_t)_iter400->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_shareResourceWithUsers_result::~Airavata_shareResourceWithUsers_result() throw() {
+}
+
+
+uint32_t Airavata_shareResourceWithUsers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_shareResourceWithUsers_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_shareResourceWithUsers_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ae) {
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->ae.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_shareResourceWithUsers_presult::~Airavata_shareResourceWithUsers_presult() throw() {
+}
+
+
+uint32_t Airavata_shareResourceWithUsers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+
+Airavata_revokeSharingOfResourceFromUsers_args::~Airavata_revokeSharingOfResourceFromUsers_args() throw() {
+}
+
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_authzToken = false;
+ bool isset_resourceId = false;
+ bool isset_resourceType = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->authzToken.read(iprot);
+ isset_authzToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->resourceId);
+ isset_resourceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast401;
+ xfer += iprot->readI32(ecast401);
+ this->resourceType = ( ::apache::airavata::model::group::ResourceType::type)ecast401;
+ isset_resourceType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->userPermissionList.clear();
+ uint32_t _size402;
+ ::apache::thrift::protocol::TType _ktype403;
+ ::apache::thrift::protocol::TType _vtype404;
+ xfer += iprot->readMapBegin(_ktype403, _vtype404, _size402);
+ uint32_t _i406;
+ for (_i406 = 0; _i406 < _size402; ++_i406)
+ {
+ std::string _key407;
+ xfer += iprot->readString(_key407);
+ ::apache::airavata::model::group::ResourcePermissionType::type& _val408 = this->userPermissionList[_key407];
+ int32_t ecast409;
+ xfer += iprot->readI32(ecast409);
+ _val408 = ( ::apache::airavata::model::group::ResourcePermissionType::type)ecast409;
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.userPermissionList = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_revokeSharingOfResourceFromUsers_args");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->resourceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)this->resourceType);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userPermissionList", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->userPermissionList.size()));
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> ::const_iterator _iter410;
+ for (_iter410 = this->userPermissionList.begin(); _iter410 != this->userPermissionList.end(); ++_iter410)
+ {
+ xfer += oprot->writeString(_iter410->first);
+ xfer += oprot->writeI32((int32_t)_iter410->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_revokeSharingOfResourceFromUsers_pargs::~Airavata_revokeSharingOfResourceFromUsers_pargs() throw() {
+}
+
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_revokeSharingOfResourceFromUsers_pargs");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->resourceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)(*(this->resourceType)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userPermissionList", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->userPermissionList)).size()));
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> ::const_iterator _iter411;
+ for (_iter411 = (*(this->userPermissionList)).begin(); _iter411 != (*(this->userPermissionList)).end(); ++_iter411)
+ {
+ xfer += oprot->writeString(_iter411->first);
+ xfer += oprot->writeI32((int32_t)_iter411->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_revokeSharingOfResourceFromUsers_result::~Airavata_revokeSharingOfResourceFromUsers_result() throw() {
+}
+
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_revokeSharingOfResourceFromUsers_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ae) {
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->ae.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_revokeSharingOfResourceFromUsers_presult::~Airavata_revokeSharingOfResourceFromUsers_presult() throw() {
+}
+
+
+uint32_t Airavata_revokeSharingOfResourceFromUsers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+
+Airavata_getAllAccessibleUsers_args::~Airavata_getAllAccessibleUsers_args() throw() {
+}
+
+
+uint32_t Airavata_getAllAccessibleUsers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_authzToken = false;
+ bool isset_resourceId = false;
+ bool isset_resourceType = false;
+ bool isset_permissionType = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->authzToken.read(iprot);
+ isset_authzToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->resourceId);
+ isset_resourceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast412;
+ xfer += iprot->readI32(ecast412);
+ this->resourceType = ( ::apache::airavata::model::group::ResourceType::type)ecast412;
+ isset_resourceType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast413;
+ xfer += iprot->readI32(ecast413);
+ this->permissionType = ( ::apache::airavata::model::group::ResourcePermissionType::type)ecast413;
+ isset_permissionType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_resourceType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_permissionType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_getAllAccessibleUsers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_getAllAccessibleUsers_args");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->resourceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)this->resourceType);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("permissionType", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)this->permissionType);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_getAllAccessibleUsers_pargs::~Airavata_getAllAccessibleUsers_pargs() throw() {
+}
+
+
+uint32_t Airavata_getAllAccessibleUsers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_getAllAccessibleUsers_pargs");
+
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->resourceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("resourceType", ::apache::thrift::protocol::T_I32, 3);
+ xfer += oprot->writeI32((int32_t)(*(this->resourceType)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("permissionType", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)(*(this->permissionType)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_getAllAccessibleUsers_result::~Airavata_getAllAccessibleUsers_result() throw() {
+}
+
+
+uint32_t Airavata_getAllAccessibleUsers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->success.clear();
+ uint32_t _size414;
+ ::apache::thrift::protocol::TType _etype417;
+ xfer += iprot->readListBegin(_etype417, _size414);
+ this->success.resize(_size414);
+ uint32_t _i418;
+ for (_i418 = 0; _i418 < _size414; ++_i418)
+ {
+ xfer += iprot->readString(this->success[_i418]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_getAllAccessibleUsers_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_getAllAccessibleUsers_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
+ std::vector<std::string> ::const_iterator _iter419;
+ for (_iter419 = this->success.begin(); _iter419 != this->success.end(); ++_iter419)
+ {
+ xfer += oprot->writeString((*_iter419));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ae) {
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->ae.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_getAllAccessibleUsers_presult::~Airavata_getAllAccessibleUsers_presult() throw() {
+}
+
+
+uint32_t Airavata_getAllAccessibleUsers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ (*(this->success)).clear();
+ uint32_t _size420;
+ ::apache::thrift::protocol::TType _etype423;
+ xfer += iprot->readListBegin(_etype423, _size420);
+ (*(this->success)).resize(_size420);
+ uint32_t _i424;
+ for (_i424 = 0; _i424 < _size420; ++_i424)
+ {
+ xfer += iprot->readString((*(this->success))[_i424]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
void AiravataClient::getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
{
send_getAPIVersion(authzToken);
@@ -45633,25 +46718,245 @@ void AiravataClient::recv_getExperimentStatistics( ::apache::airavata::model::ex
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentStatistics failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentStatistics failed: unknown result");
+}
+
+void AiravataClient::getExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const int32_t limit, const int32_t offset)
+{
+ send_getExperimentsInProject(authzToken, projectId, limit, offset);
+ recv_getExperimentsInProject(_return);
+}
+
+void AiravataClient::send_getExperimentsInProject(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const int32_t limit, const int32_t offset)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("getExperimentsInProject", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ Airavata_getExperimentsInProject_pargs args;
+ args.authzToken = &authzToken;
+ args.projectId = &projectId;
+ args.limit = &limit;
+ args.offset = &offset;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+void AiravataClient::recv_getExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return)
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("getExperimentsInProject") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_getExperimentsInProject_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.pnfe) {
+ throw result.pnfe;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentsInProject failed: unknown result");
+}
+
+void AiravataClient::getUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset)
+{
+ send_getUserExperiments(authzToken, gatewayId, userName, limit, offset);
+ recv_getUserExperiments(_return);
+}
+
+void AiravataClient::send_getUserExperiments(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("getUserExperiments", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ Airavata_getUserExperiments_pargs args;
+ args.authzToken = &authzToken;
+ args.gatewayId = &gatewayId;
+ args.userName = &userName;
+ args.limit = &limit;
+ args.offset = &offset;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+void AiravataClient::recv_getUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return)
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("getUserExperiments") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_getUserExperiments_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserExperiments failed: unknown result");
+}
+
+void AiravataClient::createExperiment(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+{
+ send_createExperiment(authzToken, gatewayId, experiment);
+ recv_createExperiment(_return);
+}
+
+void AiravataClient::send_createExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("createExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ Airavata_createExperiment_pargs args;
+ args.authzToken = &authzToken;
+ args.gatewayId = &gatewayId;
+ args.experiment = &experiment;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+void AiravataClient::recv_createExperiment(std::string& _return)
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("createExperiment") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_createExperiment_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "createExperiment failed: unknown result");
}
-void AiravataClient::getExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const int32_t limit, const int32_t offset)
+bool AiravataClient::deleteExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& experimentId)
{
- send_getExperimentsInProject(authzToken, projectId, limit, offset);
- recv_getExperimentsInProject(_return);
+ send_deleteExperiment(authzToken, experimentId);
+ return recv_deleteExperiment();
}
-void AiravataClient::send_getExperimentsInProject(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId, const int32_t limit, const int32_t offset)
+void AiravataClient::send_deleteExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& experimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getExperimentsInProject", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("deleteExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getExperimentsInProject_pargs args;
+ Airavata_deleteExperiment_pargs args;
args.authzToken = &authzToken;
- args.projectId = &projectId;
- args.limit = &limit;
- args.offset = &offset;
+ args.experimentId = &experimentId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -45659,7 +46964,7 @@ void AiravataClient::send_getExperimentsInProject(const ::apache::airavata::mod
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return)
+bool AiravataClient::recv_deleteExperiment()
{
int32_t rseqid = 0;
@@ -45679,20 +46984,20 @@ void AiravataClient::recv_getExperimentsInProject(std::vector< ::apache::airavat
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getExperimentsInProject") != 0) {
+ if (fname.compare("deleteExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getExperimentsInProject_presult result;
+ bool _return;
+ Airavata_deleteExperiment_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
if (result.__isset.success) {
- // _return pointer has now been filled
- return;
+ return _return;
}
if (result.__isset.ire) {
throw result.ire;
@@ -45703,32 +47008,26 @@ void AiravataClient::recv_getExperimentsInProject(std::vector< ::apache::airavat
if (result.__isset.ase) {
throw result.ase;
}
- if (result.__isset.pnfe) {
- throw result.pnfe;
- }
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentsInProject failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteExperiment failed: unknown result");
}
-void AiravataClient::getUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset)
+void AiravataClient::getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_getUserExperiments(authzToken, gatewayId, userName, limit, offset);
- recv_getUserExperiments(_return);
+ send_getExperiment(authzToken, airavataExperimentId);
+ recv_getExperiment(_return);
}
-void AiravataClient::send_getUserExperiments(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset)
+void AiravataClient::send_getExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getUserExperiments", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getUserExperiments_pargs args;
+ Airavata_getExperiment_pargs args;
args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.userName = &userName;
- args.limit = &limit;
- args.offset = &offset;
+ args.airavataExperimentId = &airavataExperimentId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -45736,7 +47035,7 @@ void AiravataClient::send_getUserExperiments(const ::apache::airavata::model::s
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return)
+void AiravataClient::recv_getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return)
{
int32_t rseqid = 0;
@@ -45756,12 +47055,12 @@ void AiravataClient::recv_getUserExperiments(std::vector< ::apache::airavata::mo
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getUserExperiments") != 0) {
+ if (fname.compare("getExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getUserExperiments_presult result;
+ Airavata_getExperiment_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -45774,6 +47073,9 @@ void AiravataClient::recv_getUserExperiments(std::vector< ::apache::airavata::mo
if (result.__isset.ire) {
throw result.ire;
}
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
if (result.__isset.ace) {
throw result.ace;
}
@@ -45783,24 +47085,23 @@ void AiravataClient::recv_getUserExperiments(std::vector< ::apache::airavata::mo
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserExperiments failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperiment failed: unknown result");
}
-void AiravataClient::createExperiment(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+void AiravataClient::getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_createExperiment(authzToken, gatewayId, experiment);
- recv_createExperiment(_return);
+ send_getDetailedExperimentTree(authzToken, airavataExperimentId);
+ recv_getDetailedExperimentTree(_return);
}
-void AiravataClient::send_createExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+void AiravataClient::send_getDetailedExperimentTree(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("createExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getDetailedExperimentTree", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_createExperiment_pargs args;
+ Airavata_getDetailedExperimentTree_pargs args;
args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.experiment = &experiment;
+ args.airavataExperimentId = &airavataExperimentId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -45808,7 +47109,7 @@ void AiravataClient::send_createExperiment(const ::apache::airavata::model::sec
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_createExperiment(std::string& _return)
+void AiravataClient::recv_getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return)
{
int32_t rseqid = 0;
@@ -45828,12 +47129,12 @@ void AiravataClient::recv_createExperiment(std::string& _return)
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("createExperiment") != 0) {
+ if (fname.compare("getDetailedExperimentTree") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_createExperiment_presult result;
+ Airavata_getDetailedExperimentTree_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -45846,6 +47147,9 @@ void AiravataClient::recv_createExperiment(std::string& _return)
if (result.__isset.ire) {
throw result.ire;
}
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
if (result.__isset.ace) {
throw result.ace;
}
@@ -45855,23 +47159,24 @@ void AiravataClient::recv_createExperiment(std::string& _return)
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "createExperiment failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getDetailedExperimentTree failed: unknown result");
}
-bool AiravataClient::deleteExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& experimentId)
+void AiravataClient::updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
{
- send_deleteExperiment(authzToken, experimentId);
- return recv_deleteExperiment();
+ send_updateExperiment(authzToken, airavataExperimentId, experiment);
+ recv_updateExperiment();
}
-void AiravataClient::send_deleteExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& experimentId)
+void AiravataClient::send_updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("deleteExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("updateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_deleteExperiment_pargs args;
+ Airavata_updateExperiment_pargs args;
args.authzToken = &authzToken;
- args.experimentId = &experimentId;
+ args.airavataExperimentId = &airavataExperimentId;
+ args.experiment = &experiment;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -45879,7 +47184,7 @@ void AiravataClient::send_deleteExperiment(const ::apache::airavata::model::sec
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_deleteExperiment()
+void AiravataClient::recv_updateExperiment()
{
int32_t rseqid = 0;
@@ -45899,24 +47204,22 @@ bool AiravataClient::recv_deleteExperiment()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("deleteExperiment") != 0) {
+ if (fname.compare("updateExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- bool _return;
- Airavata_deleteExperiment_presult result;
- result.success = &_return;
+ Airavata_updateExperiment_presult result;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
- if (result.__isset.success) {
- return _return;
- }
if (result.__isset.ire) {
throw result.ire;
}
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
if (result.__isset.ace) {
throw result.ace;
}
@@ -45926,23 +47229,24 @@ bool AiravataClient::recv_deleteExperiment()
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteExperiment failed: unknown result");
+ return;
}
-void AiravataClient::getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::updateExperimentConfiguration(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration)
{
- send_getExperiment(authzToken, airavataExperimentId);
- recv_getExperiment(_return);
+ send_updateExperimentConfiguration(authzToken, airavataExperimentId, userConfiguration);
+ recv_updateExperimentConfiguration();
}
-void AiravataClient::send_getExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_updateExperimentConfiguration(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("updateExperimentConfiguration", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getExperiment_pargs args;
+ Airavata_updateExperimentConfiguration_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
+ args.userConfiguration = &userConfiguration;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -45950,7 +47254,7 @@ void AiravataClient::send_getExperiment(const ::apache::airavata::model::securi
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return)
+void AiravataClient::recv_updateExperimentConfiguration()
{
int32_t rseqid = 0;
@@ -45970,53 +47274,37 @@ void AiravataClient::recv_getExperiment( ::apache::airavata::model::experiment::
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getExperiment") != 0) {
+ if (fname.compare("updateExperimentConfiguration") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getExperiment_presult result;
- result.success = &_return;
+ Airavata_updateExperimentConfiguration_presult result;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.enf) {
- throw result.enf;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperiment failed: unknown result");
+ return;
}
-void AiravataClient::getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::updateResourceScheduleing(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling)
{
- send_getDetailedExperimentTree(authzToken, airavataExperimentId);
- recv_getDetailedExperimentTree(_return);
+ send_updateResourceScheduleing(authzToken, airavataExperimentId, resourceScheduling);
+ recv_updateResourceScheduleing();
}
-void AiravataClient::send_getDetailedExperimentTree(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_updateResourceScheduleing(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getDetailedExperimentTree", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("updateResourceScheduleing", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getDetailedExperimentTree_pargs args;
+ Airavata_updateResourceScheduleing_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
+ args.resourceScheduling = &resourceScheduling;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46024,7 +47312,7 @@ void AiravataClient::send_getDetailedExperimentTree(const ::apache::airavata::m
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return)
+void AiravataClient::recv_updateResourceScheduleing()
{
int32_t rseqid = 0;
@@ -46044,54 +47332,36 @@ void AiravataClient::recv_getDetailedExperimentTree( ::apache::airavata::model::
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getDetailedExperimentTree") != 0) {
+ if (fname.compare("updateResourceScheduleing") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getDetailedExperimentTree_presult result;
- result.success = &_return;
+ Airavata_updateResourceScheduleing_presult result;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.enf) {
- throw result.enf;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getDetailedExperimentTree failed: unknown result");
+ return;
}
-void AiravataClient::updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+bool AiravataClient::validateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_updateExperiment(authzToken, airavataExperimentId, experiment);
- recv_updateExperiment();
+ send_validateExperiment(authzToken, airavataExperimentId);
+ return recv_validateExperiment();
}
-void AiravataClient::send_updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
+void AiravataClient::send_validateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("updateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("validateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_updateExperiment_pargs args;
+ Airavata_validateExperiment_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
- args.experiment = &experiment;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46099,7 +47369,7 @@ void AiravataClient::send_updateExperiment(const ::apache::airavata::model::sec
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_updateExperiment()
+bool AiravataClient::recv_validateExperiment()
{
int32_t rseqid = 0;
@@ -46119,16 +47389,21 @@ void AiravataClient::recv_updateExperiment()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("updateExperiment") != 0) {
+ if (fname.compare("validateExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_updateExperiment_presult result;
+ bool _return;
+ Airavata_validateExperiment_presult result;
+ result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
+ if (result.__isset.success) {
+ return _return;
+ }
if (result.__isset.ire) {
throw result.ire;
}
@@ -46144,24 +47419,24 @@ void AiravataClient::recv_updateExperiment()
if (result.__isset.ae) {
throw result.ae;
}
- return;
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "validateExperiment failed: unknown result");
}
-void AiravataClient::updateExperimentConfiguration(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration)
+void AiravataClient::launchExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
{
- send_updateExperimentConfiguration(authzToken, airavataExperimentId, userConfiguration);
- recv_updateExperimentConfiguration();
+ send_launchExperiment(authzToken, airavataExperimentId, gatewayId);
+ recv_launchExperiment();
}
-void AiravataClient::send_updateExperimentConfiguration(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration)
+void AiravataClient::send_launchExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("updateExperimentConfiguration", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("launchExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_updateExperimentConfiguration_pargs args;
+ Airavata_launchExperiment_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
- args.userConfiguration = &userConfiguration;
+ args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46169,7 +47444,7 @@ void AiravataClient::send_updateExperimentConfiguration(const ::apache::airavat
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_updateExperimentConfiguration()
+void AiravataClient::recv_launchExperiment()
{
int32_t rseqid = 0;
@@ -46189,37 +47464,48 @@ void AiravataClient::recv_updateExperimentConfiguration()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("updateExperimentConfiguration") != 0) {
+ if (fname.compare("launchExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_updateExperimentConfiguration_presult result;
+ Airavata_launchExperiment_presult result;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
if (result.__isset.ae) {
throw result.ae;
}
return;
}
-void AiravataClient::updateResourceScheduleing(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling)
+void AiravataClient::getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_updateResourceScheduleing(authzToken, airavataExperimentId, resourceScheduling);
- recv_updateResourceScheduleing();
+ send_getExperimentStatus(authzToken, airavataExperimentId);
+ recv_getExperimentStatus(_return);
}
-void AiravataClient::send_updateResourceScheduleing(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling)
+void AiravataClient::send_getExperimentStatus(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("updateResourceScheduleing", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getExperimentStatus", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_updateResourceScheduleing_pargs args;
+ Airavata_getExperimentStatus_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
- args.resourceScheduling = &resourceScheduling;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46227,7 +47513,7 @@ void AiravataClient::send_updateResourceScheduleing(const ::apache::airavata::m
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_updateResourceScheduleing()
+void AiravataClient::recv_getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return)
{
int32_t rseqid = 0;
@@ -46247,34 +47533,51 @@ void AiravataClient::recv_updateResourceScheduleing()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("updateResourceScheduleing") != 0) {
+ if (fname.compare("getExperimentStatus") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_updateResourceScheduleing_presult result;
+ Airavata_getExperimentStatus_presult result;
+ result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
if (result.__isset.ae) {
throw result.ae;
}
- return;
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentStatus failed: unknown result");
}
-bool AiravataClient::validateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_validateExperiment(authzToken, airavataExperimentId);
- return recv_validateExperiment();
+ send_getExperimentOutputs(authzToken, airavataExperimentId);
+ recv_getExperimentOutputs(_return);
}
-void AiravataClient::send_validateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_getExperimentOutputs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("validateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getExperimentOutputs", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_validateExperiment_pargs args;
+ Airavata_getExperimentOutputs_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
args.write(oprot_);
@@ -46284,7 +47587,7 @@ void AiravataClient::send_validateExperiment(const ::apache::airavata::model::s
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_validateExperiment()
+void AiravataClient::recv_getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return)
{
int32_t rseqid = 0;
@@ -46304,20 +47607,20 @@ bool AiravataClient::recv_validateExperiment()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("validateExperiment") != 0) {
+ if (fname.compare("getExperimentOutputs") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- bool _return;
- Airavata_validateExperiment_presult result;
+ Airavata_getExperimentOutputs_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
if (result.__isset.success) {
- return _return;
+ // _return pointer has now been filled
+ return;
}
if (result.__isset.ire) {
throw result.ire;
@@ -46334,24 +47637,23 @@ bool AiravataClient::recv_validateExperiment()
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "validateExperiment failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentOutputs failed: unknown result");
}
-void AiravataClient::launchExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
+void AiravataClient::getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_launchExperiment(authzToken, airavataExperimentId, gatewayId);
- recv_launchExperiment();
+ send_getIntermediateOutputs(authzToken, airavataExperimentId);
+ recv_getIntermediateOutputs(_return);
}
-void AiravataClient::send_launchExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
+void AiravataClient::send_getIntermediateOutputs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("launchExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getIntermediateOutputs", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_launchExperiment_pargs args;
+ Airavata_getIntermediateOutputs_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
- args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46359,7 +47661,7 @@ void AiravataClient::send_launchExperiment(const ::apache::airavata::model::sec
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_launchExperiment()
+void AiravataClient::recv_getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return)
{
int32_t rseqid = 0;
@@ -46379,16 +47681,21 @@ void AiravataClient::recv_launchExperiment()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("launchExperiment") != 0) {
+ if (fname.compare("getIntermediateOutputs") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_launchExperiment_presult result;
+ Airavata_getIntermediateOutputs_presult result;
+ result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
if (result.__isset.ire) {
throw result.ire;
}
@@ -46404,21 +47711,21 @@ void AiravataClient::recv_launchExperiment()
if (result.__isset.ae) {
throw result.ae;
}
- return;
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getIntermediateOutputs failed: unknown result");
}
-void AiravataClient::getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_getExperimentStatus(authzToken, airavataExperimentId);
- recv_getExperimentStatus(_return);
+ send_getJobStatuses(authzToken, airavataExperimentId);
+ recv_getJobStatuses(_return);
}
-void AiravataClient::send_getExperimentStatus(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_getJobStatuses(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getExperimentStatus", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getJobStatuses", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getExperimentStatus_pargs args;
+ Airavata_getJobStatuses_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
args.write(oprot_);
@@ -46428,7 +47735,7 @@ void AiravataClient::send_getExperimentStatus(const ::apache::airavata::model::
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return)
+void AiravataClient::recv_getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return)
{
int32_t rseqid = 0;
@@ -46448,12 +47755,12 @@ void AiravataClient::recv_getExperimentStatus( ::apache::airavata::model::status
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getExperimentStatus") != 0) {
+ if (fname.compare("getJobStatuses") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getExperimentStatus_presult result;
+ Airavata_getJobStatuses_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -46478,21 +47785,21 @@ void AiravataClient::recv_getExperimentStatus( ::apache::airavata::model::status
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentStatus failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getJobStatuses failed: unknown result");
}
-void AiravataClient::getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
- send_getExperimentOutputs(authzToken, airavataExperimentId);
- recv_getExperimentOutputs(_return);
+ send_getJobDetails(authzToken, airavataExperimentId);
+ recv_getJobDetails(_return);
}
-void AiravataClient::send_getExperimentOutputs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_getJobDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getExperimentOutputs", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getJobDetails", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getExperimentOutputs_pargs args;
+ Airavata_getJobDetails_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
args.write(oprot_);
@@ -46502,7 +47809,7 @@ void AiravataClient::send_getExperimentOutputs(const ::apache::airavata::model:
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return)
+void AiravataClient::recv_getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & _return)
{
int32_t rseqid = 0;
@@ -46522,12 +47829,12 @@ void AiravataClient::recv_getExperimentOutputs(std::vector< ::apache::airavata::
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getExperimentOutputs") != 0) {
+ if (fname.compare("getJobDetails") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getExperimentOutputs_presult result;
+ Airavata_getJobDetails_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -46552,23 +47859,24 @@ void AiravataClient::recv_getExperimentOutputs(std::vector< ::apache::airavata::
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperimentOutputs failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getJobDetails failed: unknown result");
}
-void AiravataClient::getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::cloneExperiment(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingExperimentID, const std::string& newExperimentName)
{
- send_getIntermediateOutputs(authzToken, airavataExperimentId);
- recv_getIntermediateOutputs(_return);
+ send_cloneExperiment(authzToken, existingExperimentID, newExperimentName);
+ recv_cloneExperiment(_return);
}
-void AiravataClient::send_getIntermediateOutputs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_cloneExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingExperimentID, const std::string& newExperimentName)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getIntermediateOutputs", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("cloneExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getIntermediateOutputs_pargs args;
+ Airavata_cloneExperiment_pargs args;
args.authzToken = &authzToken;
- args.airavataExperimentId = &airavataExperimentId;
+ args.existingExperimentID = &existingExperimentID;
+ args.newExperimentName = &newExperimentName;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46576,7 +47884,7 @@ void AiravataClient::send_getIntermediateOutputs(const ::apache::airavata::mode
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return)
+void AiravataClient::recv_cloneExperiment(std::string& _return)
{
int32_t rseqid = 0;
@@ -46596,12 +47904,12 @@ void AiravataClient::recv_getIntermediateOutputs(std::vector< ::apache::airavata
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getIntermediateOutputs") != 0) {
+ if (fname.compare("cloneExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getIntermediateOutputs_presult result;
+ Airavata_cloneExperiment_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -46626,23 +47934,24 @@ void AiravataClient::recv_getIntermediateOutputs(std::vector< ::apache::airavata
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getIntermediateOutputs failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "cloneExperiment failed: unknown result");
}
-void AiravataClient::getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::terminateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
{
- send_getJobStatuses(authzToken, airavataExperimentId);
- recv_getJobStatuses(_return);
+ send_terminateExperiment(authzToken, airavataExperimentId, gatewayId);
+ recv_terminateExperiment();
}
-void AiravataClient::send_getJobStatuses(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+void AiravataClient::send_terminateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getJobStatuses", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("terminateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getJobStatuses_pargs args;
+ Airavata_terminateExperiment_pargs args;
args.authzToken = &authzToken;
args.airavataExperimentId = &airavataExperimentId;
+ args.gatewayId = &gatewayId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -46650,7 +47959,7 @@ void AiravataClient::send_getJobStatuses(const ::apache::airavata::model::secur
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return)
+void AiravataClient::recv_terminateExperiment()
{
int32_t rseqid = 0;
@@ -46670,21 +47979,16 @@ void AiravataClient::recv_getJobStatuses(std::map<std::string, ::apache::airava
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getJobStatuses") != 0) {
+ if (fname.compare("terminateExperiment") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getJobStatuses_presult result;
- result.success = &_return;
+ Airavata_terminateExperiment_presult result;
result.read(iprot_);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
if (result.__isset.ire) {
throw result.ire;
}
@@ -46700,23 +48004,24 @@ void AiravataClient::recv_getJobStatuses(std::map<std::string, ::apache::airava
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException
<TRUNCATED>
[03/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
index dc5f0e6..ff33544 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
@@ -24,6 +24,7 @@ import apache.airavata.model.appcatalog.gatewayprofile.ttypes
import apache.airavata.model.data.movement.ttypes
import apache.airavata.model.workflow.ttypes
import apache.airavata.model.data.replica.ttypes
+import apache.airavata.model.group.ttypes
from thrift.transport import TTransport
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
index b2ae205..76c0140 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
@@ -21,6 +21,7 @@ import apache.airavata.model.status.ttypes
import apache.airavata.model.data.movement.ttypes
import apache.airavata.model.data.replica.ttypes
import apache.airavata.model.user.ttypes
+import apache.airavata.model.group.ttypes
from thrift.transport import TTransport
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index 74678df..9a4c1f5 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -121,6 +121,7 @@ class Project:
Attributes:
- projectID
- owner
+ - gatewayId
- name
- description
- creationTime
@@ -132,16 +133,18 @@ class Project:
None, # 0
(1, TType.STRING, 'projectID', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
(2, TType.STRING, 'owner', None, None, ), # 2
- (3, TType.STRING, 'name', None, None, ), # 3
- (4, TType.STRING, 'description', None, None, ), # 4
- (5, TType.I64, 'creationTime', None, None, ), # 5
- (6, TType.LIST, 'sharedUsers', (TType.STRING,None), None, ), # 6
- (7, TType.LIST, 'sharedGroups', (TType.STRING,None), None, ), # 7
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
+ (4, TType.STRING, 'name', None, None, ), # 4
+ (5, TType.STRING, 'description', None, None, ), # 5
+ (6, TType.I64, 'creationTime', None, None, ), # 6
+ (7, TType.LIST, 'sharedUsers', (TType.STRING,None), None, ), # 7
+ (8, TType.LIST, 'sharedGroups', (TType.STRING,None), None, ), # 8
)
- def __init__(self, projectID=thrift_spec[1][4], owner=None, name=None, description=None, creationTime=None, sharedUsers=None, sharedGroups=None,):
+ def __init__(self, projectID=thrift_spec[1][4], owner=None, gatewayId=None, name=None, description=None, creationTime=None, sharedUsers=None, sharedGroups=None,):
self.projectID = projectID
self.owner = owner
+ self.gatewayId = gatewayId
self.name = name
self.description = description
self.creationTime = creationTime
@@ -169,20 +172,25 @@ class Project:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.name = iprot.readString()
+ self.gatewayId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRING:
- self.description = iprot.readString()
+ self.name = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 5:
+ if ftype == TType.STRING:
+ self.description = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 6:
if ftype == TType.I64:
self.creationTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 6:
+ elif fid == 7:
if ftype == TType.LIST:
self.sharedUsers = []
(_etype3, _size0) = iprot.readListBegin()
@@ -192,7 +200,7 @@ class Project:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 7:
+ elif fid == 8:
if ftype == TType.LIST:
self.sharedGroups = []
(_etype9, _size6) = iprot.readListBegin()
@@ -220,27 +228,31 @@ class Project:
oprot.writeFieldBegin('owner', TType.STRING, 2)
oprot.writeString(self.owner)
oprot.writeFieldEnd()
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 3)
+ oprot.writeFieldBegin('name', TType.STRING, 4)
oprot.writeString(self.name)
oprot.writeFieldEnd()
if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
+ oprot.writeFieldBegin('description', TType.STRING, 5)
oprot.writeString(self.description)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.I64, 5)
+ oprot.writeFieldBegin('creationTime', TType.I64, 6)
oprot.writeI64(self.creationTime)
oprot.writeFieldEnd()
if self.sharedUsers is not None:
- oprot.writeFieldBegin('sharedUsers', TType.LIST, 6)
+ oprot.writeFieldBegin('sharedUsers', TType.LIST, 7)
oprot.writeListBegin(TType.STRING, len(self.sharedUsers))
for iter12 in self.sharedUsers:
oprot.writeString(iter12)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.sharedGroups is not None:
- oprot.writeFieldBegin('sharedGroups', TType.LIST, 7)
+ oprot.writeFieldBegin('sharedGroups', TType.LIST, 8)
oprot.writeListBegin(TType.STRING, len(self.sharedGroups))
for iter13 in self.sharedGroups:
oprot.writeString(iter13)
@@ -254,6 +266,8 @@ class Project:
raise TProtocol.TProtocolException(message='Required field projectID is unset!')
if self.owner is None:
raise TProtocol.TProtocolException(message='Required field owner is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.name is None:
raise TProtocol.TProtocolException(message='Required field name is unset!')
return
@@ -263,6 +277,7 @@ class Project:
value = 17
value = (value * 31) ^ hash(self.projectID)
value = (value * 31) ^ hash(self.owner)
+ value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.name)
value = (value * 31) ^ hash(self.description)
value = (value * 31) ^ hash(self.creationTime)
@@ -284,19 +299,31 @@ class Project:
class User:
"""
Attributes:
+ - airavataInternalUserId
- userName
- - groupList
+ - gatewayId
+ - firstName
+ - lastName
+ - email
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'userName', None, None, ), # 1
- (2, TType.LIST, 'groupList', (TType.STRUCT,(Group, Group.thrift_spec)), None, ), # 2
+ (1, TType.STRING, 'airavataInternalUserId', None, "DO_NOT_SET_AT_CLIENTS", ), # 1
+ (2, TType.STRING, 'userName', None, None, ), # 2
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
+ (4, TType.STRING, 'firstName', None, None, ), # 4
+ (5, TType.STRING, 'lastName', None, None, ), # 5
+ (6, TType.STRING, 'email', None, None, ), # 6
)
- def __init__(self, userName=None, groupList=None,):
+ def __init__(self, airavataInternalUserId=thrift_spec[1][4], userName=None, gatewayId=None, firstName=None, lastName=None, email=None,):
+ self.airavataInternalUserId = airavataInternalUserId
self.userName = userName
- self.groupList = groupList
+ self.gatewayId = gatewayId
+ self.firstName = firstName
+ self.lastName = lastName
+ self.email = email
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -309,18 +336,32 @@ class User:
break
if fid == 1:
if ftype == TType.STRING:
- self.userName = iprot.readString()
+ self.airavataInternalUserId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.LIST:
- self.groupList = []
- (_etype17, _size14) = iprot.readListBegin()
- for _i18 in xrange(_size14):
- _elem19 = Group()
- _elem19.read(iprot)
- self.groupList.append(_elem19)
- iprot.readListEnd()
+ if ftype == TType.STRING:
+ self.userName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRING:
+ self.firstName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRING:
+ self.lastName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.STRING:
+ self.email = iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -333,30 +374,49 @@ class User:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('User')
+ if self.airavataInternalUserId is not None:
+ oprot.writeFieldBegin('airavataInternalUserId', TType.STRING, 1)
+ oprot.writeString(self.airavataInternalUserId)
+ oprot.writeFieldEnd()
if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 1)
+ oprot.writeFieldBegin('userName', TType.STRING, 2)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.groupList is not None:
- oprot.writeFieldBegin('groupList', TType.LIST, 2)
- oprot.writeListBegin(TType.STRUCT, len(self.groupList))
- for iter20 in self.groupList:
- iter20.write(oprot)
- oprot.writeListEnd()
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
+ if self.firstName is not None:
+ oprot.writeFieldBegin('firstName', TType.STRING, 4)
+ oprot.writeString(self.firstName)
+ oprot.writeFieldEnd()
+ if self.lastName is not None:
+ oprot.writeFieldBegin('lastName', TType.STRING, 5)
+ oprot.writeString(self.lastName)
+ oprot.writeFieldEnd()
+ if self.email is not None:
+ oprot.writeFieldBegin('email', TType.STRING, 6)
+ oprot.writeString(self.email)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
+ if self.airavataInternalUserId is None:
+ raise TProtocol.TProtocolException(message='Required field airavataInternalUserId is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.airavataInternalUserId)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.groupList)
+ value = (value * 31) ^ hash(self.gatewayId)
+ value = (value * 31) ^ hash(self.firstName)
+ value = (value * 31) ^ hash(self.lastName)
+ value = (value * 31) ^ hash(self.email)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index 67f4495..eb5ad2d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index c0e2c31..ed543d9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index 2909325..9fe0803 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index ad292ab..3f4b1eb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 62de7a7..9412e64 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 43830b2..be7edab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index 8b2fbe8..7aa5a77 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
index d8506f4..156f48f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 141c494..8b6ad63 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 25a639b..e8bb47e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index d3d6096..da8345d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
index d572df7..36993a0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
index 648139f..cf35c0c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index fd28a7a..cbf525c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index baa05e5..c1f434e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index 9034eb6..3723463 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index 7fae4fb..b4611d7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index 043ea3b..58bc978 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 1de24f8..2a61e74 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index dec2256..34a56fd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 524888d..78bf43e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index b27d3bc..c278675 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index dd0949c..8592b43 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index c159cd3..0d495de 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
index 7eb3f0b..6e91493 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index a02d3a6..c6c3dae 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
index 9807d44..9ff98a6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
index 9d81f4c..1a453b6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
index 57494ba..b7f2c36 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index d3066d3..55a2dbb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index b70acb9..178d662 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index d10cf9b..cc07ff1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index c0ce0fc..5fd5414 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 471eb25..2a935d8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index 38c5056..cea1d68 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index d163609..128fb2e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
index 40145be..068ba9b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
index 20e109d..85b0b64 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
index 57d3440..f1a978f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
index 5f4a333..a3717f1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
index 1a9761c..e2770d4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
index 9ca3cfe..668d51a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
index bb14ef8..f3eeedb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
index 2cb70c6..0421b94 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
index 1760f95..20ace3b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
index 8362503..ec0b1ad 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index 6f1704b..572aeea 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index da66e7d..0a1540f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index 6230a41..23d98b4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index 06fbea6..7eafeca 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentSummaryModel implements org.apache.thrift.TBase<ExperimentSummaryModel, ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummaryModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index 7f5e40a..6b45354 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class UserConfigurationDataModel implements org.apache.thrift.TBase<UserConfigurationDataModel, UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationDataModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
index ead501e..09a70d0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index 2f8f94f..8b9ff00 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index d854bf5..de54dd4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, JobIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<JobIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 54a4105..b8af2d8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.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.3)", date = "2016-07-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-07")
public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
[07/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index dfe3f0d..331023c 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -2470,6 +2470,19 @@ class AiravataIf {
virtual void registerReplicaLocation(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::replica::DataReplicaLocationModel& replicaLocationModel) = 0;
virtual void getParentDataProduct( ::apache::airavata::model::data::replica::DataProductModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri) = 0;
virtual void getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri) = 0;
+
+ /**
+ * Group Manager and Data Sharing Related API methods
+ *
+ *
+ * @param authzToken
+ * @param resourceId
+ * @param resourceType
+ * @param userPermissionList
+ */
+ virtual bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0;
+ virtual bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0;
+ virtual void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType) = 0;
};
class AiravataIfFactory {
@@ -2968,6 +2981,17 @@ class AiravataNull : virtual public AiravataIf {
void getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productUri */) {
return;
}
+ bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::group::ResourceType::type /* resourceType */, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & /* userPermissionList */) {
+ bool _return = false;
+ return _return;
+ }
+ bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::group::ResourceType::type /* resourceType */, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & /* userPermissionList */) {
+ bool _return = false;
+ return _return;
+ }
+ void getAllAccessibleUsers(std::vector<std::string> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::group::ResourceType::type /* resourceType */, const ::apache::airavata::model::group::ResourcePermissionType::type /* permissionType */) {
+ return;
+ }
};
@@ -22708,6 +22732,462 @@ class Airavata_getChildDataProducts_presult {
};
+typedef struct _Airavata_shareResourceWithUsers_args__isset {
+ _Airavata_shareResourceWithUsers_args__isset() : userPermissionList(false) {}
+ bool userPermissionList :1;
+} _Airavata_shareResourceWithUsers_args__isset;
+
+class Airavata_shareResourceWithUsers_args {
+ public:
+
+ Airavata_shareResourceWithUsers_args(const Airavata_shareResourceWithUsers_args&);
+ Airavata_shareResourceWithUsers_args& operator=(const Airavata_shareResourceWithUsers_args&);
+ Airavata_shareResourceWithUsers_args() : resourceId(), resourceType(( ::apache::airavata::model::group::ResourceType::type)0) {
+ }
+
+ virtual ~Airavata_shareResourceWithUsers_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
+ std::string resourceId;
+ ::apache::airavata::model::group::ResourceType::type resourceType;
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> userPermissionList;
+
+ _Airavata_shareResourceWithUsers_args__isset __isset;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
+ void __set_resourceId(const std::string& val);
+
+ void __set_resourceType(const ::apache::airavata::model::group::ResourceType::type val);
+
+ void __set_userPermissionList(const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & val);
+
+ bool operator == (const Airavata_shareResourceWithUsers_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
+ return false;
+ if (!(resourceId == rhs.resourceId))
+ return false;
+ if (!(resourceType == rhs.resourceType))
+ return false;
+ if (!(userPermissionList == rhs.userPermissionList))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_shareResourceWithUsers_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_shareResourceWithUsers_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_shareResourceWithUsers_pargs {
+ public:
+
+
+ virtual ~Airavata_shareResourceWithUsers_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
+ const std::string* resourceId;
+ const ::apache::airavata::model::group::ResourceType::type* resourceType;
+ const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> * userPermissionList;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_shareResourceWithUsers_result__isset {
+ _Airavata_shareResourceWithUsers_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_shareResourceWithUsers_result__isset;
+
+class Airavata_shareResourceWithUsers_result {
+ public:
+
+ Airavata_shareResourceWithUsers_result(const Airavata_shareResourceWithUsers_result&);
+ Airavata_shareResourceWithUsers_result& operator=(const Airavata_shareResourceWithUsers_result&);
+ Airavata_shareResourceWithUsers_result() : success(0) {
+ }
+
+ virtual ~Airavata_shareResourceWithUsers_result() throw();
+ bool success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_shareResourceWithUsers_result__isset __isset;
+
+ void __set_success(const bool val);
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_shareResourceWithUsers_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ if (!(ae == rhs.ae))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_shareResourceWithUsers_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_shareResourceWithUsers_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_shareResourceWithUsers_presult__isset {
+ _Airavata_shareResourceWithUsers_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_shareResourceWithUsers_presult__isset;
+
+class Airavata_shareResourceWithUsers_presult {
+ public:
+
+
+ virtual ~Airavata_shareResourceWithUsers_presult() throw();
+ bool* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_shareResourceWithUsers_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+typedef struct _Airavata_revokeSharingOfResourceFromUsers_args__isset {
+ _Airavata_revokeSharingOfResourceFromUsers_args__isset() : userPermissionList(false) {}
+ bool userPermissionList :1;
+} _Airavata_revokeSharingOfResourceFromUsers_args__isset;
+
+class Airavata_revokeSharingOfResourceFromUsers_args {
+ public:
+
+ Airavata_revokeSharingOfResourceFromUsers_args(const Airavata_revokeSharingOfResourceFromUsers_args&);
+ Airavata_revokeSharingOfResourceFromUsers_args& operator=(const Airavata_revokeSharingOfResourceFromUsers_args&);
+ Airavata_revokeSharingOfResourceFromUsers_args() : resourceId(), resourceType(( ::apache::airavata::model::group::ResourceType::type)0) {
+ }
+
+ virtual ~Airavata_revokeSharingOfResourceFromUsers_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
+ std::string resourceId;
+ ::apache::airavata::model::group::ResourceType::type resourceType;
+ std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> userPermissionList;
+
+ _Airavata_revokeSharingOfResourceFromUsers_args__isset __isset;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
+ void __set_resourceId(const std::string& val);
+
+ void __set_resourceType(const ::apache::airavata::model::group::ResourceType::type val);
+
+ void __set_userPermissionList(const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & val);
+
+ bool operator == (const Airavata_revokeSharingOfResourceFromUsers_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
+ return false;
+ if (!(resourceId == rhs.resourceId))
+ return false;
+ if (!(resourceType == rhs.resourceType))
+ return false;
+ if (!(userPermissionList == rhs.userPermissionList))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_revokeSharingOfResourceFromUsers_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_revokeSharingOfResourceFromUsers_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_revokeSharingOfResourceFromUsers_pargs {
+ public:
+
+
+ virtual ~Airavata_revokeSharingOfResourceFromUsers_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
+ const std::string* resourceId;
+ const ::apache::airavata::model::group::ResourceType::type* resourceType;
+ const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> * userPermissionList;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_revokeSharingOfResourceFromUsers_result__isset {
+ _Airavata_revokeSharingOfResourceFromUsers_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_revokeSharingOfResourceFromUsers_result__isset;
+
+class Airavata_revokeSharingOfResourceFromUsers_result {
+ public:
+
+ Airavata_revokeSharingOfResourceFromUsers_result(const Airavata_revokeSharingOfResourceFromUsers_result&);
+ Airavata_revokeSharingOfResourceFromUsers_result& operator=(const Airavata_revokeSharingOfResourceFromUsers_result&);
+ Airavata_revokeSharingOfResourceFromUsers_result() : success(0) {
+ }
+
+ virtual ~Airavata_revokeSharingOfResourceFromUsers_result() throw();
+ bool success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_revokeSharingOfResourceFromUsers_result__isset __isset;
+
+ void __set_success(const bool val);
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_revokeSharingOfResourceFromUsers_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ if (!(ae == rhs.ae))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_revokeSharingOfResourceFromUsers_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_revokeSharingOfResourceFromUsers_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_revokeSharingOfResourceFromUsers_presult__isset {
+ _Airavata_revokeSharingOfResourceFromUsers_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_revokeSharingOfResourceFromUsers_presult__isset;
+
+class Airavata_revokeSharingOfResourceFromUsers_presult {
+ public:
+
+
+ virtual ~Airavata_revokeSharingOfResourceFromUsers_presult() throw();
+ bool* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_revokeSharingOfResourceFromUsers_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class Airavata_getAllAccessibleUsers_args {
+ public:
+
+ Airavata_getAllAccessibleUsers_args(const Airavata_getAllAccessibleUsers_args&);
+ Airavata_getAllAccessibleUsers_args& operator=(const Airavata_getAllAccessibleUsers_args&);
+ Airavata_getAllAccessibleUsers_args() : resourceId(), resourceType(( ::apache::airavata::model::group::ResourceType::type)0), permissionType(( ::apache::airavata::model::group::ResourcePermissionType::type)0) {
+ }
+
+ virtual ~Airavata_getAllAccessibleUsers_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
+ std::string resourceId;
+ ::apache::airavata::model::group::ResourceType::type resourceType;
+ ::apache::airavata::model::group::ResourcePermissionType::type permissionType;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
+ void __set_resourceId(const std::string& val);
+
+ void __set_resourceType(const ::apache::airavata::model::group::ResourceType::type val);
+
+ void __set_permissionType(const ::apache::airavata::model::group::ResourcePermissionType::type val);
+
+ bool operator == (const Airavata_getAllAccessibleUsers_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
+ return false;
+ if (!(resourceId == rhs.resourceId))
+ return false;
+ if (!(resourceType == rhs.resourceType))
+ return false;
+ if (!(permissionType == rhs.permissionType))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getAllAccessibleUsers_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getAllAccessibleUsers_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_getAllAccessibleUsers_pargs {
+ public:
+
+
+ virtual ~Airavata_getAllAccessibleUsers_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
+ const std::string* resourceId;
+ const ::apache::airavata::model::group::ResourceType::type* resourceType;
+ const ::apache::airavata::model::group::ResourcePermissionType::type* permissionType;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getAllAccessibleUsers_result__isset {
+ _Airavata_getAllAccessibleUsers_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_getAllAccessibleUsers_result__isset;
+
+class Airavata_getAllAccessibleUsers_result {
+ public:
+
+ Airavata_getAllAccessibleUsers_result(const Airavata_getAllAccessibleUsers_result&);
+ Airavata_getAllAccessibleUsers_result& operator=(const Airavata_getAllAccessibleUsers_result&);
+ Airavata_getAllAccessibleUsers_result() {
+ }
+
+ virtual ~Airavata_getAllAccessibleUsers_result() throw();
+ std::vector<std::string> success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getAllAccessibleUsers_result__isset __isset;
+
+ void __set_success(const std::vector<std::string> & val);
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_getAllAccessibleUsers_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ if (!(ae == rhs.ae))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getAllAccessibleUsers_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getAllAccessibleUsers_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getAllAccessibleUsers_presult__isset {
+ _Airavata_getAllAccessibleUsers_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_getAllAccessibleUsers_presult__isset;
+
+class Airavata_getAllAccessibleUsers_presult {
+ public:
+
+
+ virtual ~Airavata_getAllAccessibleUsers_presult() throw();
+ std::vector<std::string> * success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getAllAccessibleUsers_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
class AiravataClient : virtual public AiravataIf {
public:
AiravataClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
@@ -23156,6 +23636,15 @@ class AiravataClient : virtual public AiravataIf {
void getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri);
void send_getChildDataProducts(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri);
void recv_getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & _return);
+ bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ void send_shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ bool recv_shareResourceWithUsers();
+ bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ void send_revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ bool recv_revokeSharingOfResourceFromUsers();
+ void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
+ void send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
+ void recv_getAllAccessibleUsers(std::vector<std::string> & _return);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
@@ -23312,6 +23801,9 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_registerReplicaLocation(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getParentDataProduct(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getChildDataProducts(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_shareResourceWithUsers(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_revokeSharingOfResourceFromUsers(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getAllAccessibleUsers(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
public:
AiravataProcessor(boost::shared_ptr<AiravataIf> iface) :
iface_(iface) {
@@ -23456,6 +23948,9 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["registerReplicaLocation"] = &AiravataProcessor::process_registerReplicaLocation;
processMap_["getParentDataProduct"] = &AiravataProcessor::process_getParentDataProduct;
processMap_["getChildDataProducts"] = &AiravataProcessor::process_getChildDataProducts;
+ processMap_["shareResourceWithUsers"] = &AiravataProcessor::process_shareResourceWithUsers;
+ processMap_["revokeSharingOfResourceFromUsers"] = &AiravataProcessor::process_revokeSharingOfResourceFromUsers;
+ processMap_["getAllAccessibleUsers"] = &AiravataProcessor::process_getAllAccessibleUsers;
}
virtual ~AiravataProcessor() {}
@@ -24839,6 +25334,34 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
+ bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList);
+ }
+ return ifaces_[i]->shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList);
+ }
+
+ bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList);
+ }
+ return ifaces_[i]->revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList);
+ }
+
+ void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->getAllAccessibleUsers(_return, authzToken, resourceId, resourceType, permissionType);
+ }
+ ifaces_[i]->getAllAccessibleUsers(_return, authzToken, resourceId, resourceType, permissionType);
+ return;
+ }
+
};
// The 'concurrent' client is a thread safe client that correctly handles
@@ -25292,6 +25815,15 @@ class AiravataConcurrentClient : virtual public AiravataIf {
void getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri);
int32_t send_getChildDataProducts(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productUri);
void recv_getChildDataProducts(std::vector< ::apache::airavata::model::data::replica::DataProductModel> & _return, const int32_t seqid);
+ bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ int32_t send_shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ bool recv_shareResourceWithUsers(const int32_t seqid);
+ bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ int32_t send_revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList);
+ bool recv_revokeSharingOfResourceFromUsers(const int32_t seqid);
+ void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
+ int32_t send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
+ void recv_getAllAccessibleUsers(std::vector<std::string> & _return, const int32_t seqid);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index 66d0df9..27ae3ec 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -2915,6 +2915,30 @@ class AiravataHandler : virtual public AiravataIf {
printf("getChildDataProducts\n");
}
+ /**
+ * Group Manager and Data Sharing Related API methods
+ *
+ *
+ * @param authzToken
+ * @param resourceId
+ * @param resourceType
+ * @param userPermissionList
+ */
+ bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) {
+ // Your implementation goes here
+ printf("shareResourceWithUsers\n");
+ }
+
+ bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) {
+ // Your implementation goes here
+ printf("revokeSharingOfResourceFromUsers\n");
+ }
+
+ void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType) {
+ // Your implementation goes here
+ printf("getAllAccessibleUsers\n");
+ }
+
};
int main(int argc, char **argv) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
index 5d059c5..49452a0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_types.h
@@ -49,6 +49,7 @@
#include "data_movement_models_types.h"
#include "workflow_data_model_types.h"
#include "replica_catalog_models_types.h"
+#include "group_manager_model_types.h"
namespace apache { namespace airavata { namespace api {
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
index 9deb875..002a06b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_data_models_types.h
@@ -46,6 +46,7 @@
#include "data_movement_models_types.h"
#include "replica_catalog_models_types.h"
#include "user_profile_model_types.h"
+#include "group_manager_model_types.h"
namespace apache { namespace airavata { namespace model {
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
index 2229493..6133d36 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
@@ -166,6 +166,10 @@ void Project::__set_owner(const std::string& val) {
this->owner = val;
}
+void Project::__set_gatewayId(const std::string& val) {
+ this->gatewayId = val;
+}
+
void Project::__set_name(const std::string& val) {
this->name = val;
}
@@ -204,6 +208,7 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
bool isset_projectID = false;
bool isset_owner = false;
+ bool isset_gatewayId = false;
bool isset_name = false;
while (true)
@@ -232,13 +237,21 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->name);
isset_name = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->description);
this->__isset.description = true;
@@ -246,7 +259,7 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->creationTime);
this->__isset.creationTime = true;
@@ -254,7 +267,7 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->sharedUsers.clear();
@@ -274,7 +287,7 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->sharedGroups.clear();
@@ -307,6 +320,8 @@ uint32_t Project::read(::apache::thrift::protocol::TProtocol* iprot) {
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_owner)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_name)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -325,22 +340,26 @@ uint32_t Project::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeString(this->owner);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->gatewayId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->name);
xfer += oprot->writeFieldEnd();
if (this->__isset.description) {
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->description);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.creationTime) {
- xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 5);
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 6);
xfer += oprot->writeI64(this->creationTime);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.sharedUsers) {
- xfer += oprot->writeFieldBegin("sharedUsers", ::apache::thrift::protocol::T_LIST, 6);
+ xfer += oprot->writeFieldBegin("sharedUsers", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->sharedUsers.size()));
std::vector<std::string> ::const_iterator _iter12;
@@ -353,7 +372,7 @@ uint32_t Project::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeFieldEnd();
}
if (this->__isset.sharedGroups) {
- xfer += oprot->writeFieldBegin("sharedGroups", ::apache::thrift::protocol::T_LIST, 7);
+ xfer += oprot->writeFieldBegin("sharedGroups", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->sharedGroups.size()));
std::vector<std::string> ::const_iterator _iter13;
@@ -374,6 +393,7 @@ void swap(Project &a, Project &b) {
using ::std::swap;
swap(a.projectID, b.projectID);
swap(a.owner, b.owner);
+ swap(a.gatewayId, b.gatewayId);
swap(a.name, b.name);
swap(a.description, b.description);
swap(a.creationTime, b.creationTime);
@@ -385,6 +405,7 @@ void swap(Project &a, Project &b) {
Project::Project(const Project& other14) {
projectID = other14.projectID;
owner = other14.owner;
+ gatewayId = other14.gatewayId;
name = other14.name;
description = other14.description;
creationTime = other14.creationTime;
@@ -395,6 +416,7 @@ Project::Project(const Project& other14) {
Project& Project::operator=(const Project& other15) {
projectID = other15.projectID;
owner = other15.owner;
+ gatewayId = other15.gatewayId;
name = other15.name;
description = other15.description;
creationTime = other15.creationTime;
@@ -408,6 +430,7 @@ void Project::printTo(std::ostream& out) const {
out << "Project(";
out << "projectID=" << to_string(projectID);
out << ", " << "owner=" << to_string(owner);
+ out << ", " << "gatewayId=" << to_string(gatewayId);
out << ", " << "name=" << to_string(name);
out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "<null>"));
out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "<null>"));
@@ -421,13 +444,32 @@ User::~User() throw() {
}
+void User::__set_airavataInternalUserId(const std::string& val) {
+ this->airavataInternalUserId = val;
+}
+
void User::__set_userName(const std::string& val) {
this->userName = val;
+__isset.userName = true;
}
-void User::__set_groupList(const std::vector<Group> & val) {
- this->groupList = val;
-__isset.groupList = true;
+void User::__set_gatewayId(const std::string& val) {
+ this->gatewayId = val;
+}
+
+void User::__set_firstName(const std::string& val) {
+ this->firstName = val;
+__isset.firstName = true;
+}
+
+void User::__set_lastName(const std::string& val) {
+ this->lastName = val;
+__isset.lastName = true;
+}
+
+void User::__set_email(const std::string& val) {
+ this->email = val;
+__isset.email = true;
}
uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -442,7 +484,8 @@ uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
- bool isset_userName = false;
+ bool isset_airavataInternalUserId = false;
+ bool isset_gatewayId = false;
while (true)
{
@@ -454,28 +497,48 @@ uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
+ xfer += iprot->readString(this->airavataInternalUserId);
+ isset_airavataInternalUserId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->groupList.clear();
- uint32_t _size16;
- ::apache::thrift::protocol::TType _etype19;
- xfer += iprot->readListBegin(_etype19, _size16);
- this->groupList.resize(_size16);
- uint32_t _i20;
- for (_i20 = 0; _i20 < _size16; ++_i20)
- {
- xfer += this->groupList[_i20].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
- this->__isset.groupList = true;
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->userName);
+ this->__isset.userName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->firstName);
+ this->__isset.firstName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->lastName);
+ this->__isset.lastName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->email);
+ this->__isset.email = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -489,7 +552,9 @@ uint32_t User::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->readStructEnd();
- if (!isset_userName)
+ if (!isset_airavataInternalUserId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -499,21 +564,32 @@ uint32_t User::write(::apache::thrift::protocol::TProtocol* oprot) const {
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("User");
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->userName);
+ xfer += oprot->writeFieldBegin("airavataInternalUserId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->airavataInternalUserId);
xfer += oprot->writeFieldEnd();
- if (this->__isset.groupList) {
- xfer += oprot->writeFieldBegin("groupList", ::apache::thrift::protocol::T_LIST, 2);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->groupList.size()));
- std::vector<Group> ::const_iterator _iter21;
- for (_iter21 = this->groupList.begin(); _iter21 != this->groupList.end(); ++_iter21)
- {
- xfer += (*_iter21).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
+ if (this->__isset.userName) {
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->userName);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->gatewayId);
+ xfer += oprot->writeFieldEnd();
+
+ if (this->__isset.firstName) {
+ xfer += oprot->writeFieldBegin("firstName", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->firstName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.lastName) {
+ xfer += oprot->writeFieldBegin("lastName", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeString(this->lastName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.email) {
+ xfer += oprot->writeFieldBegin("email", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->email);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -523,27 +599,43 @@ uint32_t User::write(::apache::thrift::protocol::TProtocol* oprot) const {
void swap(User &a, User &b) {
using ::std::swap;
+ swap(a.airavataInternalUserId, b.airavataInternalUserId);
swap(a.userName, b.userName);
- swap(a.groupList, b.groupList);
+ swap(a.gatewayId, b.gatewayId);
+ swap(a.firstName, b.firstName);
+ swap(a.lastName, b.lastName);
+ swap(a.email, b.email);
swap(a.__isset, b.__isset);
}
-User::User(const User& other22) {
- userName = other22.userName;
- groupList = other22.groupList;
- __isset = other22.__isset;
+User::User(const User& other16) {
+ airavataInternalUserId = other16.airavataInternalUserId;
+ userName = other16.userName;
+ gatewayId = other16.gatewayId;
+ firstName = other16.firstName;
+ lastName = other16.lastName;
+ email = other16.email;
+ __isset = other16.__isset;
}
-User& User::operator=(const User& other23) {
- userName = other23.userName;
- groupList = other23.groupList;
- __isset = other23.__isset;
+User& User::operator=(const User& other17) {
+ airavataInternalUserId = other17.airavataInternalUserId;
+ userName = other17.userName;
+ gatewayId = other17.gatewayId;
+ firstName = other17.firstName;
+ lastName = other17.lastName;
+ email = other17.email;
+ __isset = other17.__isset;
return *this;
}
void User::printTo(std::ostream& out) const {
using ::apache::thrift::to_string;
out << "User(";
- out << "userName=" << to_string(userName);
- out << ", " << "groupList="; (__isset.groupList ? (out << to_string(groupList)) : (out << "<null>"));
+ out << "airavataInternalUserId=" << to_string(airavataInternalUserId);
+ out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
+ out << ", " << "gatewayId=" << to_string(gatewayId);
+ out << ", " << "firstName="; (__isset.firstName ? (out << to_string(firstName)) : (out << "<null>"));
+ out << ", " << "lastName="; (__isset.lastName ? (out << to_string(lastName)) : (out << "<null>"));
+ out << ", " << "email="; (__isset.email ? (out << to_string(email)) : (out << "<null>"));
out << ")";
}
@@ -677,19 +769,19 @@ void swap(Gateway &a, Gateway &b) {
swap(a.__isset, b.__isset);
}
-Gateway::Gateway(const Gateway& other24) {
- gatewayId = other24.gatewayId;
- gatewayName = other24.gatewayName;
- domain = other24.domain;
- emailAddress = other24.emailAddress;
- __isset = other24.__isset;
+Gateway::Gateway(const Gateway& other18) {
+ gatewayId = other18.gatewayId;
+ gatewayName = other18.gatewayName;
+ domain = other18.domain;
+ emailAddress = other18.emailAddress;
+ __isset = other18.__isset;
}
-Gateway& Gateway::operator=(const Gateway& other25) {
- gatewayId = other25.gatewayId;
- gatewayName = other25.gatewayName;
- domain = other25.domain;
- emailAddress = other25.emailAddress;
- __isset = other25.__isset;
+Gateway& Gateway::operator=(const Gateway& other19) {
+ gatewayId = other19.gatewayId;
+ gatewayName = other19.gatewayName;
+ domain = other19.domain;
+ emailAddress = other19.emailAddress;
+ __isset = other19.__isset;
return *this;
}
void Gateway::printTo(std::ostream& out) const {
@@ -826,9 +918,9 @@ uint32_t Notification::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 8:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast26;
- xfer += iprot->readI32(ecast26);
- this->priority = (NotificationPriority::type)ecast26;
+ int32_t ecast20;
+ xfer += iprot->readI32(ecast20);
+ this->priority = (NotificationPriority::type)ecast20;
this->__isset.priority = true;
} else {
xfer += iprot->skip(ftype);
@@ -912,27 +1004,27 @@ void swap(Notification &a, Notification &b) {
swap(a.__isset, b.__isset);
}
-Notification::Notification(const Notification& other27) {
- notificationId = other27.notificationId;
- gatewayId = other27.gatewayId;
- title = other27.title;
- notificationMessage = other27.notificationMessage;
- creationTime = other27.creationTime;
- publishedTime = other27.publishedTime;
- expirationTime = other27.expirationTime;
- priority = other27.priority;
- __isset = other27.__isset;
-}
-Notification& Notification::operator=(const Notification& other28) {
- notificationId = other28.notificationId;
- gatewayId = other28.gatewayId;
- title = other28.title;
- notificationMessage = other28.notificationMessage;
- creationTime = other28.creationTime;
- publishedTime = other28.publishedTime;
- expirationTime = other28.expirationTime;
- priority = other28.priority;
- __isset = other28.__isset;
+Notification::Notification(const Notification& other21) {
+ notificationId = other21.notificationId;
+ gatewayId = other21.gatewayId;
+ title = other21.title;
+ notificationMessage = other21.notificationMessage;
+ creationTime = other21.creationTime;
+ publishedTime = other21.publishedTime;
+ expirationTime = other21.expirationTime;
+ priority = other21.priority;
+ __isset = other21.__isset;
+}
+Notification& Notification::operator=(const Notification& other22) {
+ notificationId = other22.notificationId;
+ gatewayId = other22.gatewayId;
+ title = other22.title;
+ notificationMessage = other22.notificationMessage;
+ creationTime = other22.creationTime;
+ publishedTime = other22.publishedTime;
+ expirationTime = other22.expirationTime;
+ priority = other22.priority;
+ __isset = other22.__isset;
return *this;
}
void Notification::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
index 7502186..ab91afd 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
@@ -123,12 +123,13 @@ class Project {
Project(const Project&);
Project& operator=(const Project&);
- Project() : projectID("DO_NOT_SET_AT_CLIENTS"), owner(), name(), description(), creationTime(0) {
+ Project() : projectID("DO_NOT_SET_AT_CLIENTS"), owner(), gatewayId(), name(), description(), creationTime(0) {
}
virtual ~Project() throw();
std::string projectID;
std::string owner;
+ std::string gatewayId;
std::string name;
std::string description;
int64_t creationTime;
@@ -141,6 +142,8 @@ class Project {
void __set_owner(const std::string& val);
+ void __set_gatewayId(const std::string& val);
+
void __set_name(const std::string& val);
void __set_description(const std::string& val);
@@ -157,6 +160,8 @@ class Project {
return false;
if (!(owner == rhs.owner))
return false;
+ if (!(gatewayId == rhs.gatewayId))
+ return false;
if (!(name == rhs.name))
return false;
if (__isset.description != rhs.__isset.description)
@@ -198,8 +203,11 @@ inline std::ostream& operator<<(std::ostream& out, const Project& obj)
}
typedef struct _User__isset {
- _User__isset() : groupList(false) {}
- bool groupList :1;
+ _User__isset() : userName(false), firstName(false), lastName(false), email(false) {}
+ bool userName :1;
+ bool firstName :1;
+ bool lastName :1;
+ bool email :1;
} _User__isset;
class User {
@@ -207,26 +215,52 @@ class User {
User(const User&);
User& operator=(const User&);
- User() : userName() {
+ User() : airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userName(), gatewayId(), firstName(), lastName(), email() {
}
virtual ~User() throw();
+ std::string airavataInternalUserId;
std::string userName;
- std::vector<Group> groupList;
+ std::string gatewayId;
+ std::string firstName;
+ std::string lastName;
+ std::string email;
_User__isset __isset;
+ void __set_airavataInternalUserId(const std::string& val);
+
void __set_userName(const std::string& val);
- void __set_groupList(const std::vector<Group> & val);
+ void __set_gatewayId(const std::string& val);
+
+ void __set_firstName(const std::string& val);
+
+ void __set_lastName(const std::string& val);
+
+ void __set_email(const std::string& val);
bool operator == (const User & rhs) const
{
- if (!(userName == rhs.userName))
+ if (!(airavataInternalUserId == rhs.airavataInternalUserId))
+ return false;
+ if (__isset.userName != rhs.__isset.userName)
+ return false;
+ else if (__isset.userName && !(userName == rhs.userName))
+ return false;
+ if (!(gatewayId == rhs.gatewayId))
+ return false;
+ if (__isset.firstName != rhs.__isset.firstName)
+ return false;
+ else if (__isset.firstName && !(firstName == rhs.firstName))
+ return false;
+ if (__isset.lastName != rhs.__isset.lastName)
+ return false;
+ else if (__isset.lastName && !(lastName == rhs.lastName))
return false;
- if (__isset.groupList != rhs.__isset.groupList)
+ if (__isset.email != rhs.__isset.email)
return false;
- else if (__isset.groupList && !(groupList == rhs.groupList))
+ else if (__isset.email && !(email == rhs.email))
return false;
return true;
}
[05/10] airavata git commit: creating new branch for grouper
integration
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
index 61355c2..5ad921c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
@@ -140,6 +140,10 @@ class Project {
/**
* @var string
*/
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
public $name = null;
/**
* @var string
@@ -170,18 +174,22 @@ class Project {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'name',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
4 => array(
- 'var' => 'description',
+ 'var' => 'name',
'type' => TType::STRING,
),
5 => array(
+ 'var' => 'description',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 6 => array(
+ 7 => array(
'var' => 'sharedUsers',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -189,7 +197,7 @@ class Project {
'type' => TType::STRING,
),
),
- 7 => array(
+ 8 => array(
'var' => 'sharedGroups',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -206,6 +214,9 @@ class Project {
if (isset($vals['owner'])) {
$this->owner = $vals['owner'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
if (isset($vals['name'])) {
$this->name = $vals['name'];
}
@@ -259,26 +270,33 @@ class Project {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->name);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->description);
+ $xfer += $input->readString($this->name);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->description);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 7:
if ($ftype == TType::LST) {
$this->sharedUsers = array();
$_size0 = 0;
@@ -295,7 +313,7 @@ class Project {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 8:
if ($ftype == TType::LST) {
$this->sharedGroups = array();
$_size6 = 0;
@@ -335,18 +353,23 @@ class Project {
$xfer += $output->writeString($this->owner);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->name !== null) {
- $xfer += $output->writeFieldBegin('name', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('name', TType::STRING, 4);
$xfer += $output->writeString($this->name);
$xfer += $output->writeFieldEnd();
}
if ($this->description !== null) {
- $xfer += $output->writeFieldBegin('description', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('description', TType::STRING, 5);
$xfer += $output->writeString($this->description);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 6);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
@@ -354,7 +377,7 @@ class Project {
if (!is_array($this->sharedUsers)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('sharedUsers', TType::LST, 6);
+ $xfer += $output->writeFieldBegin('sharedUsers', TType::LST, 7);
{
$output->writeListBegin(TType::STRING, count($this->sharedUsers));
{
@@ -371,7 +394,7 @@ class Project {
if (!is_array($this->sharedGroups)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('sharedGroups', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('sharedGroups', TType::LST, 8);
{
$output->writeListBegin(TType::STRING, count($this->sharedGroups));
{
@@ -397,36 +420,75 @@ class User {
/**
* @var string
*/
+ public $airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS";
+ /**
+ * @var string
+ */
public $userName = null;
/**
- * @var \Airavata\Model\Workspace\Group[]
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $firstName = null;
+ /**
+ * @var string
+ */
+ public $lastName = null;
+ /**
+ * @var string
*/
- public $groupList = null;
+ public $email = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'userName',
+ 'var' => 'airavataInternalUserId',
'type' => TType::STRING,
),
2 => array(
- 'var' => 'groupList',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Group',
- ),
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'firstName',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'lastName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'email',
+ 'type' => TType::STRING,
),
);
}
if (is_array($vals)) {
+ if (isset($vals['airavataInternalUserId'])) {
+ $this->airavataInternalUserId = $vals['airavataInternalUserId'];
+ }
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['groupList'])) {
- $this->groupList = $vals['groupList'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['firstName'])) {
+ $this->firstName = $vals['firstName'];
+ }
+ if (isset($vals['lastName'])) {
+ $this->lastName = $vals['lastName'];
+ }
+ if (isset($vals['email'])) {
+ $this->email = $vals['email'];
}
}
}
@@ -452,25 +514,42 @@ class User {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
+ $xfer += $input->readString($this->airavataInternalUserId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 2:
- if ($ftype == TType::LST) {
- $this->groupList = array();
- $_size14 = 0;
- $_etype17 = 0;
- $xfer += $input->readListBegin($_etype17, $_size14);
- for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
- {
- $elem19 = null;
- $elem19 = new \Airavata\Model\Workspace\Group();
- $xfer += $elem19->read($input);
- $this->groupList []= $elem19;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->firstName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->lastName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->email);
} else {
$xfer += $input->skip($ftype);
}
@@ -488,26 +567,34 @@ class User {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('User');
+ if ($this->airavataInternalUserId !== null) {
+ $xfer += $output->writeFieldBegin('airavataInternalUserId', TType::STRING, 1);
+ $xfer += $output->writeString($this->airavataInternalUserId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 1);
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->groupList !== null) {
- if (!is_array($this->groupList)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('groupList', TType::LST, 2);
- {
- $output->writeListBegin(TType::STRUCT, count($this->groupList));
- {
- foreach ($this->groupList as $iter20)
- {
- $xfer += $iter20->write($output);
- }
- }
- $output->writeListEnd();
- }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->firstName !== null) {
+ $xfer += $output->writeFieldBegin('firstName', TType::STRING, 4);
+ $xfer += $output->writeString($this->firstName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastName !== null) {
+ $xfer += $output->writeFieldBegin('lastName', TType::STRING, 5);
+ $xfer += $output->writeString($this->lastName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->email !== null) {
+ $xfer += $output->writeFieldBegin('email', TType::STRING, 6);
+ $xfer += $output->writeString($this->email);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
http://git-wip-us.apache.org/repos/asf/airavata/blob/70f85795/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index a0dd723..aa94dce 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -165,6 +165,9 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' string registerReplicaLocation(AuthzToken authzToken, DataReplicaLocationModel replicaLocationModel)')
print(' DataProductModel getParentDataProduct(AuthzToken authzToken, string productUri)')
print(' getChildDataProducts(AuthzToken authzToken, string productUri)')
+ print(' bool shareResourceWithUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
+ print(' bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
+ print(' getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)')
print('')
sys.exit(0)
@@ -1067,6 +1070,24 @@ elif cmd == 'getChildDataProducts':
sys.exit(1)
pp.pprint(client.getChildDataProducts(eval(args[0]),args[1],))
+elif cmd == 'shareResourceWithUsers':
+ if len(args) != 4:
+ print('shareResourceWithUsers requires 4 args')
+ sys.exit(1)
+ pp.pprint(client.shareResourceWithUsers(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+
+elif cmd == 'revokeSharingOfResourceFromUsers':
+ if len(args) != 4:
+ print('revokeSharingOfResourceFromUsers requires 4 args')
+ sys.exit(1)
+ pp.pprint(client.revokeSharingOfResourceFromUsers(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+
+elif cmd == 'getAllAccessibleUsers':
+ if len(args) != 4:
+ print('getAllAccessibleUsers requires 4 args')
+ sys.exit(1)
+ pp.pprint(client.getAllAccessibleUsers(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+
else:
print('Unrecognized method %s' % cmd)
sys.exit(1)