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 2015/08/02 22:42:42 UTC
[01/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Repository: airavata
Updated Branches:
refs/heads/master bd97f809c -> eb4a737c5
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 1fbaeea..b863e8c 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 2a6264d..02ee084 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 fbdc394..1fd7d0b 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 42a579d..ef54285 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 9b1fc3a..e338b4f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 0603a67..2dc9600 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 5251520..dcb6c85 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
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* A friendly description of the task, usally used to communicate information to users.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 d7c35bc..1355124 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 e4d9466..4ba6f30 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 4ff7b33..65b4506 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 0ea46f7..007afcc 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,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 d0e10bc..058b656 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,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index fbf5a47..f62b13d 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -60,7 +60,7 @@ namespace js ApacheAiravataAPI
* in a change to major/minor version numbers.
*
*/
-const string AIRAVATA_API_VERSION = "0.15.0"
+const string AIRAVATA_API_VERSION = "0.16.0"
service Airavata {
@@ -201,22 +201,6 @@ service Airavata {
5: airavata_errors.AuthorizationException ae)
/**
- * Get all Project by user
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- *
- * @param userName
- * The Project Object described in the workspace_model
- * @deprecated Instead use getAllUserProjectsWithPagination
- **/
- list<workspace_model.Project> getAllUserProjects (1: required string gatewayId,
- 2: required string userName)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
- /**
* Get all Project by user with pagination. Results will be ordered based
* on creation time DESC
*
@@ -229,7 +213,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
**/
- list<workspace_model.Project> getAllUserProjectsWithPagination (1: required security_model.AuthzToken authzToken,
+ list<workspace_model.Project> getUserProjects(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required i32 limit,
@@ -240,24 +224,6 @@ service Airavata {
4: airavata_errors.AuthorizationException ae)
/**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- */
- list<workspace_model.Project> searchProjectsByProjectName (1: required string gatewayId,
- 2: required string userName,
- 3: required string projectName)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
- /**
* Get all Project for user by project name with pagination.Results will be ordered based
* on creation time DESC
*
@@ -272,7 +238,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<workspace_model.Project> searchProjectsByProjectNameWithPagination (1: required security_model.AuthzToken authzToken,
+ list<workspace_model.Project> searchProjectsByProjectName (1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required string projectName,
@@ -284,22 +250,6 @@ service Airavata {
4: airavata_errors.AuthorizationException ae)
/**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- */
- list<workspace_model.Project> searchProjectsByProjectDesc (1: required string gatewayId,
- 2: required string userName, 3: required string description)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
- /**
* Search and get all Projects for user by project description with pagination. Results
* will be ordered based on creation time DESC
*
@@ -314,7 +264,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<workspace_model.Project> searchProjectsByProjectDescWithPagination (1: required security_model.AuthzToken authzToken,
+ list<workspace_model.Project> searchProjectsByProjectDesc(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required string description,
@@ -325,26 +275,6 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param useNname
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- */
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByName (1: required string gatewayId,
- 2: required string userName, 3: required string expName)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
/**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
@@ -360,7 +290,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByNameWithPagination (1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentSummaryModel> searchExperimentsByName(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required string expName,
@@ -372,24 +302,6 @@ service Airavata {
4: airavata_errors.AuthorizationException ae)
/**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- */
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByDesc (1: required string gatewayId,
- 2: required string userName, 3: required string description)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
- /**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
*
@@ -404,7 +316,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByDescWithPagination (1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentSummaryModel> searchExperimentsByDesc(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required string description,
@@ -415,24 +327,6 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
-
- /**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplicationWithPagination
- */
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplication (1: required string gatewayId,
- 2: required string userName, 3: required string applicationId)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
/**
* Search Experiments by application id with pagination. Results will be sorted
* based on creation time DESC
@@ -448,7 +342,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplicationWithPagination (1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplication(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required string applicationId,
@@ -458,23 +352,6 @@ service Airavata {
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- /**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiement state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- */
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatus (1: required string gatewayId,
- 2: required string userName, 3: required status_models.ExperimentState experimentState)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
/**
* Search Experiments by experiment status with pagination. Results will be sorted
@@ -491,7 +368,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatusWithPagination (1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentSummaryModel> searchExperimentsByStatus(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required status_models.ExperimentState experimentState,
@@ -503,26 +380,6 @@ service Airavata {
4: airavata_errors.AuthorizationException ae)
/**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTimeWithPagination
- */
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTime (1: required string gatewayId,
- 2: required string userName, 3: required i64 fromTime, 4: required i64 toTime)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
- /**
* Search Experiments by experiment creation time with pagination. Results will be sorted
* based on creation time DESC
*
@@ -539,7 +396,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination (1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTime(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required i64 fromTime,
@@ -595,22 +452,9 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- /**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- */
- list<experiment_model.ExperimentModel> getAllExperimentsInProject(1: required string projectId)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.ProjectNotFoundException pnfe)
/**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -620,7 +464,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentModel> getAllExperimentsInProjectWithPagination(1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentModel> getExperimentsInProject(1: required security_model.AuthzToken authzToken,
2: required string projectId,
3: required i32 limit,
4: required i32 offset)
@@ -630,25 +474,8 @@ service Airavata {
4: airavata_errors.ProjectNotFoundException pnfe,
5: airavata_errors.AuthorizationException ae)
-
- /**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- */
- list<experiment_model.ExperimentModel> getAllUserExperiments(1: required string gatewayId,
- 2: required string userName)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase)
-
/**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get experiments by user with pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -660,7 +487,7 @@ service Airavata {
* @param offset
* The starting point of the results to be fetched
*/
- list<experiment_model.ExperimentModel> getAllUserExperimentsWithPagination(1: required security_model.AuthzToken authzToken,
+ list<experiment_model.ExperimentModel> getUserExperiments(1: required security_model.AuthzToken authzToken,
2: required string gatewayId,
3: required string userName,
4: required i32 limit,
[13/13] airavata git commit: adding Authz token as a parameter for
Airavata credential store API methods
Posted by sc...@apache.org.
adding Authz token as a parameter for Airavata credential store API methods
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eb4a737c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eb4a737c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eb4a737c
Branch: refs/heads/master
Commit: eb4a737c5150ae7313d4038808ddce8d1564abd1
Parents: dc61c67
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Aug 3 02:06:37 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Aug 3 02:06:37 2015 +0530
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 9 +-
.../java/org/apache/airavata/api/Airavata.java | 423 +++++++++++++++++--
.../main/resources/lib/airavata/Airavata.cpp | 102 ++++-
.../src/main/resources/lib/airavata/Airavata.h | 85 ++--
.../lib/airavata/Airavata_server.skeleton.cpp | 7 +-
.../resources/lib/Airavata/API/Airavata.php | 126 +++++-
.../lib/apache/airavata/api/Airavata-remote | 24 +-
.../lib/apache/airavata/api/Airavata.py | 111 +++--
.../airavata-api/airavata_api.thrift | 10 +-
9 files changed, 731 insertions(+), 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 50097a1..ee1a5a8 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
@@ -244,17 +244,20 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public String generateAndRegisterSSHKeys(String gatewayId, String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ @SecurityCheck
+ public String generateAndRegisterSSHKeys(AuthzToken authzToken, String gatewayId, String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
return null;
}
@Override
- public String getSSHPubKey(String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ @SecurityCheck
+ public String getSSHPubKey(AuthzToken authzToken, String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
return null;
}
@Override
- public Map<String, String> getAllUserSSHPubKeys(String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ @SecurityCheck
+ public Map<String, String> getAllUserSSHPubKeys(AuthzToken authzToken, String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
return null;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 c52fe55..4a19fdb 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
@@ -91,14 +91,15 @@ public class Airavata {
*
*
*
+ * @param authzToken
* @param gatewayId
* @param userName
*/
- public String generateAndRegisterSSHKeys(String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public String generateAndRegisterSSHKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public String getSSHPubKey(String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public String getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public Map<String,String> getAllUserSSHPubKeys(String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public Map<String,String> getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
/**
* Creates a Project with basic metadata.
@@ -1762,11 +1763,11 @@ public class Airavata {
public void isGatewayExist(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void generateAndRegisterSSHKeys(String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void generateAndRegisterSSHKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getSSHPubKey(String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllUserSSHPubKeys(String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void createProject(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.workspace.Project project, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -2252,15 +2253,16 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isGatewayExist failed: unknown result");
}
- public String generateAndRegisterSSHKeys(String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public String generateAndRegisterSSHKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_generateAndRegisterSSHKeys(gatewayId, userName);
+ send_generateAndRegisterSSHKeys(authzToken, gatewayId, userName);
return recv_generateAndRegisterSSHKeys();
}
- public void send_generateAndRegisterSSHKeys(String gatewayId, String userName) throws org.apache.thrift.TException
+ public void send_generateAndRegisterSSHKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName) throws org.apache.thrift.TException
{
generateAndRegisterSSHKeys_args args = new generateAndRegisterSSHKeys_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
sendBase("generateAndRegisterSSHKeys", args);
@@ -2285,15 +2287,16 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result");
}
- public String getSSHPubKey(String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public String getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_getSSHPubKey(airavataCredStoreToken);
+ send_getSSHPubKey(authzToken, airavataCredStoreToken);
return recv_getSSHPubKey();
}
- public void send_getSSHPubKey(String airavataCredStoreToken) throws org.apache.thrift.TException
+ public void send_getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken) throws org.apache.thrift.TException
{
getSSHPubKey_args args = new getSSHPubKey_args();
+ args.setAuthzToken(authzToken);
args.setAiravataCredStoreToken(airavataCredStoreToken);
sendBase("getSSHPubKey", args);
}
@@ -2317,15 +2320,16 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSSHPubKey failed: unknown result");
}
- public Map<String,String> getAllUserSSHPubKeys(String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public Map<String,String> getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_getAllUserSSHPubKeys(userName);
+ send_getAllUserSSHPubKeys(authzToken, userName);
return recv_getAllUserSSHPubKeys();
}
- public void send_getAllUserSSHPubKeys(String userName) throws org.apache.thrift.TException
+ public void send_getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.thrift.TException
{
getAllUserSSHPubKeys_args args = new getAllUserSSHPubKeys_args();
+ args.setAuthzToken(authzToken);
args.setUserName(userName);
sendBase("getAllUserSSHPubKeys", args);
}
@@ -6560,18 +6564,20 @@ public class Airavata {
}
}
- public void generateAndRegisterSSHKeys(String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void generateAndRegisterSSHKeys(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- generateAndRegisterSSHKeys_call method_call = new generateAndRegisterSSHKeys_call(gatewayId, userName, resultHandler, this, ___protocolFactory, ___transport);
+ generateAndRegisterSSHKeys_call method_call = new generateAndRegisterSSHKeys_call(authzToken, gatewayId, userName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class generateAndRegisterSSHKeys_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayId;
private String userName;
- public generateAndRegisterSSHKeys_call(String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public generateAndRegisterSSHKeys_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, 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.gatewayId = gatewayId;
this.userName = userName;
}
@@ -6579,6 +6585,7 @@ public class Airavata {
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("generateAndRegisterSSHKeys", org.apache.thrift.protocol.TMessageType.CALL, 0));
generateAndRegisterSSHKeys_args args = new generateAndRegisterSSHKeys_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
args.write(prot);
@@ -6595,23 +6602,26 @@ public class Airavata {
}
}
- public void getSSHPubKey(String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getSSHPubKey(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getSSHPubKey_call method_call = new getSSHPubKey_call(airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
+ getSSHPubKey_call method_call = new getSSHPubKey_call(authzToken, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class getSSHPubKey_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
private String airavataCredStoreToken;
- public getSSHPubKey_call(String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getSSHPubKey_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataCredStoreToken, 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.airavataCredStoreToken = airavataCredStoreToken;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getSSHPubKey", org.apache.thrift.protocol.TMessageType.CALL, 0));
getSSHPubKey_args args = new getSSHPubKey_args();
+ args.setAuthzToken(authzToken);
args.setAiravataCredStoreToken(airavataCredStoreToken);
args.write(prot);
prot.writeMessageEnd();
@@ -6627,23 +6637,26 @@ public class Airavata {
}
}
- public void getAllUserSSHPubKeys(String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getAllUserSSHPubKeys(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getAllUserSSHPubKeys_call method_call = new getAllUserSSHPubKeys_call(userName, resultHandler, this, ___protocolFactory, ___transport);
+ getAllUserSSHPubKeys_call method_call = new getAllUserSSHPubKeys_call(authzToken, userName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class getAllUserSSHPubKeys_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
private String userName;
- public getAllUserSSHPubKeys_call(String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getAllUserSSHPubKeys_call(org.apache.airavata.model.security.AuthzToken authzToken, String userName, 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.userName = userName;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllUserSSHPubKeys", org.apache.thrift.protocol.TMessageType.CALL, 0));
getAllUserSSHPubKeys_args args = new getAllUserSSHPubKeys_args();
+ args.setAuthzToken(authzToken);
args.setUserName(userName);
args.write(prot);
prot.writeMessageEnd();
@@ -11053,7 +11066,7 @@ public class Airavata {
public generateAndRegisterSSHKeys_result getResult(I iface, generateAndRegisterSSHKeys_args args) throws org.apache.thrift.TException {
generateAndRegisterSSHKeys_result result = new generateAndRegisterSSHKeys_result();
try {
- result.success = iface.generateAndRegisterSSHKeys(args.gatewayId, args.userName);
+ result.success = iface.generateAndRegisterSSHKeys(args.authzToken, args.gatewayId, args.userName);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -11081,7 +11094,7 @@ public class Airavata {
public getSSHPubKey_result getResult(I iface, getSSHPubKey_args args) throws org.apache.thrift.TException {
getSSHPubKey_result result = new getSSHPubKey_result();
try {
- result.success = iface.getSSHPubKey(args.airavataCredStoreToken);
+ result.success = iface.getSSHPubKey(args.authzToken, args.airavataCredStoreToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -11109,7 +11122,7 @@ public class Airavata {
public getAllUserSSHPubKeys_result getResult(I iface, getAllUserSSHPubKeys_args args) throws org.apache.thrift.TException {
getAllUserSSHPubKeys_result result = new getAllUserSSHPubKeys_result();
try {
- result.success = iface.getAllUserSSHPubKeys(args.userName);
+ result.success = iface.getAllUserSSHPubKeys(args.authzToken, args.userName);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15083,7 +15096,7 @@ public class Airavata {
}
public void start(I iface, generateAndRegisterSSHKeys_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.generateAndRegisterSSHKeys(args.gatewayId, args.userName,resultHandler);
+ iface.generateAndRegisterSSHKeys(args.authzToken, args.gatewayId, args.userName,resultHandler);
}
}
@@ -15150,7 +15163,7 @@ public class Airavata {
}
public void start(I iface, getSSHPubKey_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.getSSHPubKey(args.airavataCredStoreToken,resultHandler);
+ iface.getSSHPubKey(args.authzToken, args.airavataCredStoreToken,resultHandler);
}
}
@@ -15217,7 +15230,7 @@ public class Airavata {
}
public void start(I iface, getAllUserSSHPubKeys_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,String>> resultHandler) throws TException {
- iface.getAllUserSSHPubKeys(args.userName,resultHandler);
+ iface.getAllUserSSHPubKeys(args.authzToken, args.userName,resultHandler);
}
}
@@ -31606,8 +31619,9 @@ public class Airavata {
public static class generateAndRegisterSSHKeys_args implements org.apache.thrift.TBase<generateAndRegisterSSHKeys_args, generateAndRegisterSSHKeys_args._Fields>, java.io.Serializable, Cloneable, Comparable<generateAndRegisterSSHKeys_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("generateAndRegisterSSHKeys_args");
- 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)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 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 GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ 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)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -31615,13 +31629,15 @@ public class Airavata {
schemes.put(TupleScheme.class, new generateAndRegisterSSHKeys_argsTupleSchemeFactory());
}
+ public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String gatewayId; // required
public String userName; // 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 {
- GATEWAY_ID((short)1, "gatewayId"),
- USER_NAME((short)2, "userName");
+ AUTHZ_TOKEN((short)1, "authzToken"),
+ GATEWAY_ID((short)2, "gatewayId"),
+ USER_NAME((short)3, "userName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -31636,9 +31652,11 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // GATEWAY_ID
+ case 1: // AUTHZ_TOKEN
+ return AUTHZ_TOKEN;
+ case 2: // GATEWAY_ID
return GATEWAY_ID;
- case 2: // USER_NAME
+ case 3: // USER_NAME
return USER_NAME;
default:
return null;
@@ -31683,6 +31701,8 @@ public class Airavata {
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.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.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -31695,10 +31715,12 @@ public class Airavata {
}
public generateAndRegisterSSHKeys_args(
+ org.apache.airavata.model.security.AuthzToken authzToken,
String gatewayId,
String userName)
{
this();
+ this.authzToken = authzToken;
this.gatewayId = gatewayId;
this.userName = userName;
}
@@ -31707,6 +31729,9 @@ public class Airavata {
* Performs a deep copy on <i>other</i>.
*/
public generateAndRegisterSSHKeys_args(generateAndRegisterSSHKeys_args other) {
+ if (other.isSetAuthzToken()) {
+ this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ }
if (other.isSetGatewayId()) {
this.gatewayId = other.gatewayId;
}
@@ -31721,10 +31746,35 @@ public class Airavata {
@Override
public void clear() {
+ this.authzToken = null;
this.gatewayId = null;
this.userName = null;
}
+ public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
+ return this.authzToken;
+ }
+
+ public generateAndRegisterSSHKeys_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 getGatewayId() {
return this.gatewayId;
}
@@ -31775,6 +31825,14 @@ public class Airavata {
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 GATEWAY_ID:
if (value == null) {
unsetGatewayId();
@@ -31796,6 +31854,9 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
+ case AUTHZ_TOKEN:
+ return getAuthzToken();
+
case GATEWAY_ID:
return getGatewayId();
@@ -31813,6 +31874,8 @@ public class Airavata {
}
switch (field) {
+ case AUTHZ_TOKEN:
+ return isSetAuthzToken();
case GATEWAY_ID:
return isSetGatewayId();
case USER_NAME:
@@ -31834,6 +31897,15 @@ public class Airavata {
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_gatewayId = true && this.isSetGatewayId();
boolean that_present_gatewayId = true && that.isSetGatewayId();
if (this_present_gatewayId || that_present_gatewayId) {
@@ -31859,6 +31931,11 @@ public class Airavata {
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_gatewayId = true && (isSetGatewayId());
list.add(present_gatewayId);
if (present_gatewayId)
@@ -31880,6 +31957,16 @@ public class Airavata {
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(isSetGatewayId()).compareTo(other.isSetGatewayId());
if (lastComparison != 0) {
return lastComparison;
@@ -31920,6 +32007,14 @@ public class Airavata {
StringBuilder sb = new StringBuilder("generateAndRegisterSSHKeys_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("gatewayId:");
if (this.gatewayId == null) {
sb.append("null");
@@ -31941,6 +32036,9 @@ public class Airavata {
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 (gatewayId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
}
@@ -31948,6 +32046,9 @@ public class Airavata {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' 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 {
@@ -31984,7 +32085,16 @@ public class Airavata {
break;
}
switch (schemeField.id) {
- case 1: // GATEWAY_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: // GATEWAY_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
@@ -31992,7 +32102,7 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // USER_NAME
+ case 3: // USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
@@ -32015,6 +32125,11 @@ public class Airavata {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.authzToken != null) {
+ oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
+ struct.authzToken.write(oprot);
+ oprot.writeFieldEnd();
+ }
if (struct.gatewayId != null) {
oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
oprot.writeString(struct.gatewayId);
@@ -32042,6 +32157,7 @@ public class Airavata {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, generateAndRegisterSSHKeys_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.authzToken.write(oprot);
oprot.writeString(struct.gatewayId);
oprot.writeString(struct.userName);
}
@@ -32049,6 +32165,9 @@ public class Airavata {
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, generateAndRegisterSSHKeys_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);
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
struct.userName = iprot.readString();
@@ -32743,7 +32862,8 @@ public class Airavata {
public static class getSSHPubKey_args implements org.apache.thrift.TBase<getSSHPubKey_args, getSSHPubKey_args._Fields>, java.io.Serializable, Cloneable, Comparable<getSSHPubKey_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSSHPubKey_args");
- private static final org.apache.thrift.protocol.TField AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataCredStoreToken", org.apache.thrift.protocol.TType.STRING, (short)1);
+ 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_CRED_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataCredStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -32751,11 +32871,13 @@ public class Airavata {
schemes.put(TupleScheme.class, new getSSHPubKey_argsTupleSchemeFactory());
}
+ public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String airavataCredStoreToken; // 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 {
- AIRAVATA_CRED_STORE_TOKEN((short)1, "airavataCredStoreToken");
+ AUTHZ_TOKEN((short)1, "authzToken"),
+ AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -32770,7 +32892,9 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // AIRAVATA_CRED_STORE_TOKEN
+ case 1: // AUTHZ_TOKEN
+ return AUTHZ_TOKEN;
+ case 2: // AIRAVATA_CRED_STORE_TOKEN
return AIRAVATA_CRED_STORE_TOKEN;
default:
return null;
@@ -32815,6 +32939,8 @@ public class Airavata {
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_CRED_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("airavataCredStoreToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -32825,9 +32951,11 @@ public class Airavata {
}
public getSSHPubKey_args(
+ org.apache.airavata.model.security.AuthzToken authzToken,
String airavataCredStoreToken)
{
this();
+ this.authzToken = authzToken;
this.airavataCredStoreToken = airavataCredStoreToken;
}
@@ -32835,6 +32963,9 @@ public class Airavata {
* Performs a deep copy on <i>other</i>.
*/
public getSSHPubKey_args(getSSHPubKey_args other) {
+ if (other.isSetAuthzToken()) {
+ this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ }
if (other.isSetAiravataCredStoreToken()) {
this.airavataCredStoreToken = other.airavataCredStoreToken;
}
@@ -32846,9 +32977,34 @@ public class Airavata {
@Override
public void clear() {
+ this.authzToken = null;
this.airavataCredStoreToken = null;
}
+ public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
+ return this.authzToken;
+ }
+
+ public getSSHPubKey_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 getAiravataCredStoreToken() {
return this.airavataCredStoreToken;
}
@@ -32875,6 +33031,14 @@ public class Airavata {
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_CRED_STORE_TOKEN:
if (value == null) {
unsetAiravataCredStoreToken();
@@ -32888,6 +33052,9 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
+ case AUTHZ_TOKEN:
+ return getAuthzToken();
+
case AIRAVATA_CRED_STORE_TOKEN:
return getAiravataCredStoreToken();
@@ -32902,6 +33069,8 @@ public class Airavata {
}
switch (field) {
+ case AUTHZ_TOKEN:
+ return isSetAuthzToken();
case AIRAVATA_CRED_STORE_TOKEN:
return isSetAiravataCredStoreToken();
}
@@ -32921,6 +33090,15 @@ public class Airavata {
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_airavataCredStoreToken = true && this.isSetAiravataCredStoreToken();
boolean that_present_airavataCredStoreToken = true && that.isSetAiravataCredStoreToken();
if (this_present_airavataCredStoreToken || that_present_airavataCredStoreToken) {
@@ -32937,6 +33115,11 @@ public class Airavata {
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_airavataCredStoreToken = true && (isSetAiravataCredStoreToken());
list.add(present_airavataCredStoreToken);
if (present_airavataCredStoreToken)
@@ -32953,6 +33136,16 @@ public class Airavata {
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(isSetAiravataCredStoreToken()).compareTo(other.isSetAiravataCredStoreToken());
if (lastComparison != 0) {
return lastComparison;
@@ -32983,6 +33176,14 @@ public class Airavata {
StringBuilder sb = new StringBuilder("getSSHPubKey_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("airavataCredStoreToken:");
if (this.airavataCredStoreToken == null) {
sb.append("null");
@@ -32996,10 +33197,16 @@ public class Airavata {
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 (airavataCredStoreToken == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataCredStoreToken' 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 {
@@ -33036,7 +33243,16 @@ public class Airavata {
break;
}
switch (schemeField.id) {
- case 1: // AIRAVATA_CRED_STORE_TOKEN
+ 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_CRED_STORE_TOKEN
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.airavataCredStoreToken = iprot.readString();
struct.setAiravataCredStoreTokenIsSet(true);
@@ -33059,6 +33275,11 @@ public class Airavata {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.authzToken != null) {
+ oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
+ struct.authzToken.write(oprot);
+ oprot.writeFieldEnd();
+ }
if (struct.airavataCredStoreToken != null) {
oprot.writeFieldBegin(AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC);
oprot.writeString(struct.airavataCredStoreToken);
@@ -33081,12 +33302,16 @@ public class Airavata {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, getSSHPubKey_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.authzToken.write(oprot);
oprot.writeString(struct.airavataCredStoreToken);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, getSSHPubKey_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);
struct.airavataCredStoreToken = iprot.readString();
struct.setAiravataCredStoreTokenIsSet(true);
}
@@ -33779,7 +34004,8 @@ public class Airavata {
public static class getAllUserSSHPubKeys_args implements org.apache.thrift.TBase<getAllUserSSHPubKeys_args, getAllUserSSHPubKeys_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllUserSSHPubKeys_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllUserSSHPubKeys_args");
- 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 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 USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -33787,11 +34013,13 @@ public class Airavata {
schemes.put(TupleScheme.class, new getAllUserSSHPubKeys_argsTupleSchemeFactory());
}
+ public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String userName; // 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 {
- USER_NAME((short)1, "userName");
+ AUTHZ_TOKEN((short)1, "authzToken"),
+ USER_NAME((short)2, "userName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -33806,7 +34034,9 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // USER_NAME
+ case 1: // AUTHZ_TOKEN
+ return AUTHZ_TOKEN;
+ case 2: // USER_NAME
return USER_NAME;
default:
return null;
@@ -33851,6 +34081,8 @@ public class Airavata {
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.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -33861,9 +34093,11 @@ public class Airavata {
}
public getAllUserSSHPubKeys_args(
+ org.apache.airavata.model.security.AuthzToken authzToken,
String userName)
{
this();
+ this.authzToken = authzToken;
this.userName = userName;
}
@@ -33871,6 +34105,9 @@ public class Airavata {
* Performs a deep copy on <i>other</i>.
*/
public getAllUserSSHPubKeys_args(getAllUserSSHPubKeys_args other) {
+ if (other.isSetAuthzToken()) {
+ this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
+ }
if (other.isSetUserName()) {
this.userName = other.userName;
}
@@ -33882,9 +34119,34 @@ public class Airavata {
@Override
public void clear() {
+ this.authzToken = null;
this.userName = null;
}
+ public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
+ return this.authzToken;
+ }
+
+ public getAllUserSSHPubKeys_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 getUserName() {
return this.userName;
}
@@ -33911,6 +34173,14 @@ public class Airavata {
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 USER_NAME:
if (value == null) {
unsetUserName();
@@ -33924,6 +34194,9 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
+ case AUTHZ_TOKEN:
+ return getAuthzToken();
+
case USER_NAME:
return getUserName();
@@ -33938,6 +34211,8 @@ public class Airavata {
}
switch (field) {
+ case AUTHZ_TOKEN:
+ return isSetAuthzToken();
case USER_NAME:
return isSetUserName();
}
@@ -33957,6 +34232,15 @@ public class Airavata {
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_userName = true && this.isSetUserName();
boolean that_present_userName = true && that.isSetUserName();
if (this_present_userName || that_present_userName) {
@@ -33973,6 +34257,11 @@ public class Airavata {
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_userName = true && (isSetUserName());
list.add(present_userName);
if (present_userName)
@@ -33989,6 +34278,16 @@ public class Airavata {
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(isSetUserName()).compareTo(other.isSetUserName());
if (lastComparison != 0) {
return lastComparison;
@@ -34019,6 +34318,14 @@ public class Airavata {
StringBuilder sb = new StringBuilder("getAllUserSSHPubKeys_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("userName:");
if (this.userName == null) {
sb.append("null");
@@ -34032,10 +34339,16 @@ public class Airavata {
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 (userName == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' 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 {
@@ -34072,7 +34385,16 @@ public class Airavata {
break;
}
switch (schemeField.id) {
- case 1: // USER_NAME
+ 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: // USER_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
@@ -34095,6 +34417,11 @@ public class Airavata {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.authzToken != null) {
+ oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
+ struct.authzToken.write(oprot);
+ oprot.writeFieldEnd();
+ }
if (struct.userName != null) {
oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
oprot.writeString(struct.userName);
@@ -34117,12 +34444,16 @@ public class Airavata {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, getAllUserSSHPubKeys_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ struct.authzToken.write(oprot);
oprot.writeString(struct.userName);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, getAllUserSSHPubKeys_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);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 e1f991b..4753522 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
@@ -2050,6 +2050,7 @@ uint32_t Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
@@ -2062,6 +2063,14 @@ uint32_t Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
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->gatewayId);
isset_gatewayId = true;
@@ -2069,7 +2078,7 @@ uint32_t Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -2086,6 +2095,8 @@ uint32_t Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
@@ -2098,11 +2109,15 @@ uint32_t Airavata_generateAndRegisterSSHKeys_args::write(::apache::thrift::proto
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
@@ -2122,11 +2137,15 @@ uint32_t Airavata_generateAndRegisterSSHKeys_pargs::write(::apache::thrift::prot
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_pargs");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
@@ -2318,6 +2337,7 @@ uint32_t Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_airavataCredStoreToken = false;
while (true)
@@ -2329,6 +2349,14 @@ uint32_t Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
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->airavataCredStoreToken);
isset_airavataCredStoreToken = true;
@@ -2345,6 +2373,8 @@ uint32_t Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_airavataCredStoreToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -2355,7 +2385,11 @@ uint32_t Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_args");
- xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->airavataCredStoreToken);
xfer += oprot->writeFieldEnd();
@@ -2375,7 +2409,11 @@ uint32_t Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtoco
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_pargs");
- xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->airavataCredStoreToken)));
xfer += oprot->writeFieldEnd();
@@ -2567,6 +2605,7 @@ uint32_t Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_userName = false;
while (true)
@@ -2578,6 +2617,14 @@ uint32_t Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
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->userName);
isset_userName = true;
@@ -2594,6 +2641,8 @@ uint32_t Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -2604,7 +2653,11 @@ uint32_t Airavata_getAllUserSSHPubKeys_args::write(::apache::thrift::protocol::T
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_args");
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
@@ -2624,7 +2677,11 @@ uint32_t Airavata_getAllUserSSHPubKeys_pargs::write(::apache::thrift::protocol::
oprot->incrementRecursionDepth();
xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_pargs");
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
@@ -36970,18 +37027,19 @@ bool AiravataClient::recv_isGatewayExist()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isGatewayExist failed: unknown result");
}
-void AiravataClient::generateAndRegisterSSHKeys(std::string& _return, const std::string& gatewayId, const std::string& userName)
+void AiravataClient::generateAndRegisterSSHKeys(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
{
- send_generateAndRegisterSSHKeys(gatewayId, userName);
+ send_generateAndRegisterSSHKeys(authzToken, gatewayId, userName);
recv_generateAndRegisterSSHKeys(_return);
}
-void AiravataClient::send_generateAndRegisterSSHKeys(const std::string& gatewayId, const std::string& userName)
+void AiravataClient::send_generateAndRegisterSSHKeys(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("generateAndRegisterSSHKeys", ::apache::thrift::protocol::T_CALL, cseqid);
Airavata_generateAndRegisterSSHKeys_pargs args;
+ args.authzToken = &authzToken;
args.gatewayId = &gatewayId;
args.userName = &userName;
args.write(oprot_);
@@ -37038,18 +37096,19 @@ void AiravataClient::recv_generateAndRegisterSSHKeys(std::string& _return)
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result");
}
-void AiravataClient::getSSHPubKey(std::string& _return, const std::string& airavataCredStoreToken)
+void AiravataClient::getSSHPubKey(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken)
{
- send_getSSHPubKey(airavataCredStoreToken);
+ send_getSSHPubKey(authzToken, airavataCredStoreToken);
recv_getSSHPubKey(_return);
}
-void AiravataClient::send_getSSHPubKey(const std::string& airavataCredStoreToken)
+void AiravataClient::send_getSSHPubKey(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("getSSHPubKey", ::apache::thrift::protocol::T_CALL, cseqid);
Airavata_getSSHPubKey_pargs args;
+ args.authzToken = &authzToken;
args.airavataCredStoreToken = &airavataCredStoreToken;
args.write(oprot_);
@@ -37105,18 +37164,19 @@ void AiravataClient::recv_getSSHPubKey(std::string& _return)
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getSSHPubKey failed: unknown result");
}
-void AiravataClient::getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const std::string& userName)
+void AiravataClient::getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
- send_getAllUserSSHPubKeys(userName);
+ send_getAllUserSSHPubKeys(authzToken, userName);
recv_getAllUserSSHPubKeys(_return);
}
-void AiravataClient::send_getAllUserSSHPubKeys(const std::string& userName)
+void AiravataClient::send_getAllUserSSHPubKeys(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("getAllUserSSHPubKeys", ::apache::thrift::protocol::T_CALL, cseqid);
Airavata_getAllUserSSHPubKeys_pargs args;
+ args.authzToken = &authzToken;
args.userName = &userName;
args.write(oprot_);
@@ -45355,7 +45415,7 @@ void AiravataProcessor::process_generateAndRegisterSSHKeys(int32_t seqid, ::apac
Airavata_generateAndRegisterSSHKeys_result result;
try {
- iface_->generateAndRegisterSSHKeys(result.success, args.gatewayId, args.userName);
+ iface_->generateAndRegisterSSHKeys(result.success, args.authzToken, args.gatewayId, args.userName);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -45418,7 +45478,7 @@ void AiravataProcessor::process_getSSHPubKey(int32_t seqid, ::apache::thrift::pr
Airavata_getSSHPubKey_result result;
try {
- iface_->getSSHPubKey(result.success, args.airavataCredStoreToken);
+ iface_->getSSHPubKey(result.success, args.authzToken, args.airavataCredStoreToken);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -45481,7 +45541,7 @@ void AiravataProcessor::process_getAllUserSSHPubKeys(int32_t seqid, ::apache::th
Airavata_getAllUserSSHPubKeys_result result;
try {
- iface_->getAllUserSSHPubKeys(result.success, args.userName);
+ iface_->getAllUserSSHPubKeys(result.success, args.authzToken, args.userName);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 bd3cd79..88a9de4 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
@@ -62,12 +62,13 @@ class AiravataIf {
*
*
*
+ * @param authzToken
* @param gatewayId
* @param userName
*/
- virtual void generateAndRegisterSSHKeys(std::string& _return, const std::string& gatewayId, const std::string& userName) = 0;
- virtual void getSSHPubKey(std::string& _return, const std::string& airavataCredStoreToken) = 0;
- virtual void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const std::string& userName) = 0;
+ virtual void generateAndRegisterSSHKeys(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName) = 0;
+ virtual void getSSHPubKey(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken) = 0;
+ virtual void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) = 0;
/**
* Creates a Project with basic metadata.
@@ -1739,13 +1740,13 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- void generateAndRegisterSSHKeys(std::string& /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */) {
+ void generateAndRegisterSSHKeys(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */) {
return;
}
- void getSSHPubKey(std::string& /* _return */, const std::string& /* airavataCredStoreToken */) {
+ void getSSHPubKey(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataCredStoreToken */) {
return;
}
- void getAllUserSSHPubKeys(std::map<std::string, std::string> & /* _return */, const std::string& /* userName */) {
+ void getAllUserSSHPubKeys(std::map<std::string, std::string> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */) {
return;
}
void createProject(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const ::apache::airavata::model::workspace::Project& /* project */) {
@@ -3158,8 +3159,8 @@ class Airavata_isGatewayExist_presult {
class Airavata_generateAndRegisterSSHKeys_args {
public:
- static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
- static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+ static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
+ static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
Airavata_generateAndRegisterSSHKeys_args(const Airavata_generateAndRegisterSSHKeys_args&);
Airavata_generateAndRegisterSSHKeys_args& operator=(const Airavata_generateAndRegisterSSHKeys_args&);
@@ -3167,15 +3168,20 @@ class Airavata_generateAndRegisterSSHKeys_args {
}
virtual ~Airavata_generateAndRegisterSSHKeys_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
void __set_gatewayId(const std::string& val);
void __set_userName(const std::string& val);
bool operator == (const Airavata_generateAndRegisterSSHKeys_args & rhs) const
{
+ if (!(authzToken == rhs.authzToken))
+ return false;
if (!(gatewayId == rhs.gatewayId))
return false;
if (!(userName == rhs.userName))
@@ -3198,11 +3204,12 @@ class Airavata_generateAndRegisterSSHKeys_args {
class Airavata_generateAndRegisterSSHKeys_pargs {
public:
- static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
- static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+ static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
+ static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
virtual ~Airavata_generateAndRegisterSSHKeys_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
@@ -3302,8 +3309,8 @@ class Airavata_generateAndRegisterSSHKeys_presult {
class Airavata_getSSHPubKey_args {
public:
- static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
- static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
Airavata_getSSHPubKey_args(const Airavata_getSSHPubKey_args&);
Airavata_getSSHPubKey_args& operator=(const Airavata_getSSHPubKey_args&);
@@ -3311,12 +3318,17 @@ class Airavata_getSSHPubKey_args {
}
virtual ~Airavata_getSSHPubKey_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string airavataCredStoreToken;
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
void __set_airavataCredStoreToken(const std::string& val);
bool operator == (const Airavata_getSSHPubKey_args & rhs) const
{
+ if (!(authzToken == rhs.authzToken))
+ return false;
if (!(airavataCredStoreToken == rhs.airavataCredStoreToken))
return false;
return true;
@@ -3337,11 +3349,12 @@ class Airavata_getSSHPubKey_args {
class Airavata_getSSHPubKey_pargs {
public:
- static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
- static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
virtual ~Airavata_getSSHPubKey_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* airavataCredStoreToken;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -3440,8 +3453,8 @@ class Airavata_getSSHPubKey_presult {
class Airavata_getAllUserSSHPubKeys_args {
public:
- static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
- static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
Airavata_getAllUserSSHPubKeys_args(const Airavata_getAllUserSSHPubKeys_args&);
Airavata_getAllUserSSHPubKeys_args& operator=(const Airavata_getAllUserSSHPubKeys_args&);
@@ -3449,12 +3462,17 @@ class Airavata_getAllUserSSHPubKeys_args {
}
virtual ~Airavata_getAllUserSSHPubKeys_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string userName;
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
void __set_userName(const std::string& val);
bool operator == (const Airavata_getAllUserSSHPubKeys_args & rhs) const
{
+ if (!(authzToken == rhs.authzToken))
+ return false;
if (!(userName == rhs.userName))
return false;
return true;
@@ -3475,11 +3493,12 @@ class Airavata_getAllUserSSHPubKeys_args {
class Airavata_getAllUserSSHPubKeys_pargs {
public:
- static const char* ascii_fingerprint; // = "EFB929595D312AC8F305D5A794CFEDA1";
- static const uint8_t binary_fingerprint[16]; // = {0xEF,0xB9,0x29,0x59,0x5D,0x31,0x2A,0xC8,0xF3,0x05,0xD5,0xA7,0x94,0xCF,0xED,0xA1};
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
virtual ~Airavata_getAllUserSSHPubKeys_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* userName;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -20488,14 +20507,14 @@ class AiravataClient : virtual public AiravataIf {
bool isGatewayExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
void send_isGatewayExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
bool recv_isGatewayExist();
- void generateAndRegisterSSHKeys(std::string& _return, const std::string& gatewayId, const std::string& userName);
- void send_generateAndRegisterSSHKeys(const std::string& gatewayId, const std::string& userName);
+ void generateAndRegisterSSHKeys(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName);
+ void send_generateAndRegisterSSHKeys(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName);
void recv_generateAndRegisterSSHKeys(std::string& _return);
- void getSSHPubKey(std::string& _return, const std::string& airavataCredStoreToken);
- void send_getSSHPubKey(const std::string& airavataCredStoreToken);
+ void getSSHPubKey(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken);
+ void send_getSSHPubKey(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken);
void recv_getSSHPubKey(std::string& _return);
- void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const std::string& userName);
- void send_getAllUserSSHPubKeys(const std::string& userName);
+ void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
+ void send_getAllUserSSHPubKeys(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
void recv_getAllUserSSHPubKeys(std::map<std::string, std::string> & _return);
void createProject(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Project& project);
void send_createProject(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Project& project);
@@ -21165,33 +21184,33 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->isGatewayExist(authzToken, gatewayId);
}
- void generateAndRegisterSSHKeys(std::string& _return, const std::string& gatewayId, const std::string& userName) {
+ void generateAndRegisterSSHKeys(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->generateAndRegisterSSHKeys(_return, gatewayId, userName);
+ ifaces_[i]->generateAndRegisterSSHKeys(_return, authzToken, gatewayId, userName);
}
- ifaces_[i]->generateAndRegisterSSHKeys(_return, gatewayId, userName);
+ ifaces_[i]->generateAndRegisterSSHKeys(_return, authzToken, gatewayId, userName);
return;
}
- void getSSHPubKey(std::string& _return, const std::string& airavataCredStoreToken) {
+ void getSSHPubKey(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getSSHPubKey(_return, airavataCredStoreToken);
+ ifaces_[i]->getSSHPubKey(_return, authzToken, airavataCredStoreToken);
}
- ifaces_[i]->getSSHPubKey(_return, airavataCredStoreToken);
+ ifaces_[i]->getSSHPubKey(_return, authzToken, airavataCredStoreToken);
return;
}
- void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const std::string& userName) {
+ void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getAllUserSSHPubKeys(_return, userName);
+ ifaces_[i]->getAllUserSSHPubKeys(_return, authzToken, userName);
}
- ifaces_[i]->getAllUserSSHPubKeys(_return, userName);
+ ifaces_[i]->getAllUserSSHPubKeys(_return, authzToken, userName);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 8f8ff24..7e8b86d 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
@@ -95,20 +95,21 @@ class AiravataHandler : virtual public AiravataIf {
*
*
*
+ * @param authzToken
* @param gatewayId
* @param userName
*/
- void generateAndRegisterSSHKeys(std::string& _return, const std::string& gatewayId, const std::string& userName) {
+ void generateAndRegisterSSHKeys(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName) {
// Your implementation goes here
printf("generateAndRegisterSSHKeys\n");
}
- void getSSHPubKey(std::string& _return, const std::string& airavataCredStoreToken) {
+ void getSSHPubKey(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataCredStoreToken) {
// Your implementation goes here
printf("getSSHPubKey\n");
}
- void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const std::string& userName) {
+ void getAllUserSSHPubKeys(std::map<std::string, std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) {
// Your implementation goes here
printf("getAllUserSSHPubKeys\n");
}
[03/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 680a7d6..d4de996 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
@@ -162,25 +162,7 @@ class Iface:
"""
pass
- def getAllUserProjects(self, gatewayId, userName):
- """
- * Get all Project by user
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- *
- * @param userName
- * The Project Object described in the workspace_model
- * @deprecated Instead use getAllUserProjectsWithPagination
- *
-
- Parameters:
- - gatewayId
- - userName
- """
- pass
-
- def getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
+ def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
"""
* Get all Project by user with pagination. Results will be ordered based
* on creation time DESC
@@ -204,26 +186,7 @@ class Iface:
"""
pass
- def searchProjectsByProjectName(self, gatewayId, userName, projectName):
- """
- Get all Project for user by project name
-
- @param gatewayId
- The identifier for the requested gateway.
- @param userName
- The identifier of the user
- @param projectName
- The name of the project on which the results to be fetched
- @deprecated Instead use searchProjectsByProjectNameWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - projectName
- """
- pass
-
- def searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
+ def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
"""
Get all Project for user by project name with pagination.Results will be ordered based
on creation time DESC
@@ -249,25 +212,7 @@ class Iface:
"""
pass
- def searchProjectsByProjectDesc(self, gatewayId, userName, description):
- """
- Get all Project for user by project description
- @param gatewayId
- The identifier for the requested gateway.
- @param userName
- The identifier of the user
- @param description
- The description to be matched
- @deprecated Instead use searchProjectsByProjectDescWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - description
- """
- pass
-
- def searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+ def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
"""
Search and get all Projects for user by project description with pagination. Results
will be ordered based on creation time DESC
@@ -293,28 +238,7 @@ class Iface:
"""
pass
- def searchExperimentsByName(self, gatewayId, userName, expName):
- """
- Search Experiments by experiment name
-
- @param gatewayId
- Identifier of the requested gateway
- @param useNname
- Username of the requested user
- @param expName
- Experiment name to be matched
- @deprecated
- Instead use searchExperimentsByNameWithPagination
-
-
- Parameters:
- - gatewayId
- - userName
- - expName
- """
- pass
-
- def searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
+ def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
"""
Search Experiments by experiment name with pagination. Results will be sorted
based on creation time DESC
@@ -340,27 +264,7 @@ class Iface:
"""
pass
- def searchExperimentsByDesc(self, gatewayId, userName, description):
- """
- Search Experiments by experiment name
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param description
- Experiment description to be matched
- @deprecated
- Instead use searchExperimentsByDescWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - description
- """
- pass
-
- def searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+ def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
"""
Search Experiments by experiment name with pagination. Results will be sorted
based on creation time DESC
@@ -386,27 +290,7 @@ class Iface:
"""
pass
- def searchExperimentsByApplication(self, gatewayId, userName, applicationId):
- """
- Search Experiments by application id
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param applicationId
- Application id to be matched
- @deprecated
- Instead use searchExperimentsByApplicationWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - applicationId
- """
- pass
-
- def searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+ def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
"""
Search Experiments by application id with pagination. Results will be sorted
based on creation time DESC
@@ -432,27 +316,7 @@ class Iface:
"""
pass
- def searchExperimentsByStatus(self, gatewayId, userName, experimentState):
- """
- Search Experiments by experiment status
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param experimentState
- Experiement state to be matched
- @deprecated
- Instead use searchExperimentsByStatusWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - experimentState
- """
- pass
-
- def searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+ def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
"""
Search Experiments by experiment status with pagination. Results will be sorted
based on creation time DESC
@@ -478,30 +342,7 @@ class Iface:
"""
pass
- def searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
- """
- Search Experiments by experiment creation time
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param fromTime
- Start time of the experiments creation time
- @param toTime
- End time of the experiement creation time
- @deprecated
- Instead use searchExperimentsByCreationTimeWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - fromTime
- - toTime
- """
- pass
-
- def searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
+ def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
"""
Search Experiments by experiment creation time with pagination. Results will be sorted
based on creation time DESC
@@ -575,23 +416,9 @@ class Iface:
"""
pass
- def getAllExperimentsInProject(self, projectId):
- """
- Get all Experiments within a Project
-
- @param projectId
- Identifier of the project
- @deprecated
- Instead use getAllExperimentsInProjectWithPagination
-
- Parameters:
- - projectId
+ def getExperimentsInProject(self, authzToken, projectId, limit, offset):
"""
- pass
-
- def getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
- """
- Get all Experiments within project with pagination. Results will be sorted
+ Get Experiments within project with pagination. Results will be sorted
based on creation time DESC
@param projectId
@@ -609,26 +436,9 @@ class Iface:
"""
pass
- def getAllUserExperiments(self, gatewayId, userName):
+ def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
"""
- Get all Experiments by user
-
- @param gatewayId
- Identifier of the requesting gateway
- @param userName
- Username of the requested user
- @deprecated
- Instead use getAllUserExperimentsWithPagination
-
- Parameters:
- - gatewayId
- - userName
- """
- pass
-
- def getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
- """
- Get all Experiments by user pagination. Results will be sorted
+ Get experiments by user with pagination. Results will be sorted
based on creation time DESC
@param gatewayId
@@ -2879,56 +2689,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteProject failed: unknown result");
- def getAllUserProjects(self, gatewayId, userName):
- """
- * Get all Project by user
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- *
- * @param userName
- * The Project Object described in the workspace_model
- * @deprecated Instead use getAllUserProjectsWithPagination
- *
-
- Parameters:
- - gatewayId
- - userName
- """
- self.send_getAllUserProjects(gatewayId, userName)
- return self.recv_getAllUserProjects()
-
- def send_getAllUserProjects(self, gatewayId, userName):
- self._oprot.writeMessageBegin('getAllUserProjects', TMessageType.CALL, self._seqid)
- args = getAllUserProjects_args()
- args.gatewayId = gatewayId
- args.userName = userName
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllUserProjects(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllUserProjects_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProjects failed: unknown result");
-
- def getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
+ def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
"""
* Get all Project by user with pagination. Results will be ordered based
* on creation time DESC
@@ -2950,12 +2711,12 @@ class Client(Iface):
- limit
- offset
"""
- self.send_getAllUserProjectsWithPagination(authzToken, gatewayId, userName, limit, offset)
- return self.recv_getAllUserProjectsWithPagination()
+ self.send_getUserProjects(authzToken, gatewayId, userName, limit, offset)
+ return self.recv_getUserProjects()
- def send_getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
- self._oprot.writeMessageBegin('getAllUserProjectsWithPagination', TMessageType.CALL, self._seqid)
- args = getAllUserProjectsWithPagination_args()
+ def send_getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
+ self._oprot.writeMessageBegin('getUserProjects', TMessageType.CALL, self._seqid)
+ args = getUserProjects_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
@@ -2965,7 +2726,7 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getAllUserProjectsWithPagination(self):
+ def recv_getUserProjects(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -2973,7 +2734,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getAllUserProjectsWithPagination_result()
+ result = getUserProjects_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -2986,60 +2747,9 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProjectsWithPagination failed: unknown result");
-
- def searchProjectsByProjectName(self, gatewayId, userName, projectName):
- """
- Get all Project for user by project name
-
- @param gatewayId
- The identifier for the requested gateway.
- @param userName
- The identifier of the user
- @param projectName
- The name of the project on which the results to be fetched
- @deprecated Instead use searchProjectsByProjectNameWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - projectName
- """
- self.send_searchProjectsByProjectName(gatewayId, userName, projectName)
- return self.recv_searchProjectsByProjectName()
-
- def send_searchProjectsByProjectName(self, gatewayId, userName, projectName):
- self._oprot.writeMessageBegin('searchProjectsByProjectName', TMessageType.CALL, self._seqid)
- args = searchProjectsByProjectName_args()
- args.gatewayId = gatewayId
- args.userName = userName
- args.projectName = projectName
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchProjectsByProjectName(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchProjectsByProjectName_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProjects failed: unknown result");
- def searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
+ def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
"""
Get all Project for user by project name with pagination.Results will be ordered based
on creation time DESC
@@ -3063,12 +2773,12 @@ class Client(Iface):
- limit
- offset
"""
- self.send_searchProjectsByProjectNameWithPagination(authzToken, gatewayId, userName, projectName, limit, offset)
- return self.recv_searchProjectsByProjectNameWithPagination()
+ self.send_searchProjectsByProjectName(authzToken, gatewayId, userName, projectName, limit, offset)
+ return self.recv_searchProjectsByProjectName()
- def send_searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
- self._oprot.writeMessageBegin('searchProjectsByProjectNameWithPagination', TMessageType.CALL, self._seqid)
- args = searchProjectsByProjectNameWithPagination_args()
+ def send_searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
+ self._oprot.writeMessageBegin('searchProjectsByProjectName', TMessageType.CALL, self._seqid)
+ args = searchProjectsByProjectName_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
@@ -3079,7 +2789,7 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchProjectsByProjectNameWithPagination(self):
+ def recv_searchProjectsByProjectName(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3087,7 +2797,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchProjectsByProjectNameWithPagination_result()
+ result = searchProjectsByProjectName_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3100,59 +2810,9 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectNameWithPagination failed: unknown result");
-
- def searchProjectsByProjectDesc(self, gatewayId, userName, description):
- """
- Get all Project for user by project description
- @param gatewayId
- The identifier for the requested gateway.
- @param userName
- The identifier of the user
- @param description
- The description to be matched
- @deprecated Instead use searchProjectsByProjectDescWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - description
- """
- self.send_searchProjectsByProjectDesc(gatewayId, userName, description)
- return self.recv_searchProjectsByProjectDesc()
-
- def send_searchProjectsByProjectDesc(self, gatewayId, userName, description):
- self._oprot.writeMessageBegin('searchProjectsByProjectDesc', TMessageType.CALL, self._seqid)
- args = searchProjectsByProjectDesc_args()
- args.gatewayId = gatewayId
- args.userName = userName
- args.description = description
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchProjectsByProjectDesc(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchProjectsByProjectDesc_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
- def searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+ def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
"""
Search and get all Projects for user by project description with pagination. Results
will be ordered based on creation time DESC
@@ -3176,12 +2836,12 @@ class Client(Iface):
- limit
- offset
"""
- self.send_searchProjectsByProjectDescWithPagination(authzToken, gatewayId, userName, description, limit, offset)
- return self.recv_searchProjectsByProjectDescWithPagination()
+ self.send_searchProjectsByProjectDesc(authzToken, gatewayId, userName, description, limit, offset)
+ return self.recv_searchProjectsByProjectDesc()
- def send_searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
- self._oprot.writeMessageBegin('searchProjectsByProjectDescWithPagination', TMessageType.CALL, self._seqid)
- args = searchProjectsByProjectDescWithPagination_args()
+ def send_searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
+ self._oprot.writeMessageBegin('searchProjectsByProjectDesc', TMessageType.CALL, self._seqid)
+ args = searchProjectsByProjectDesc_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
@@ -3192,7 +2852,7 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchProjectsByProjectDescWithPagination(self):
+ def recv_searchProjectsByProjectDesc(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3200,7 +2860,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchProjectsByProjectDescWithPagination_result()
+ result = searchProjectsByProjectDesc_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3213,36 +2873,44 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDescWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
- def searchExperimentsByName(self, gatewayId, userName, expName):
+ def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
"""
- Search Experiments by experiment name
+ Search Experiments by experiment name with pagination. Results will be sorted
+ based on creation time DESC
@param gatewayId
Identifier of the requested gateway
- @param useNname
+ @param userName
Username of the requested user
@param expName
Experiment name to be matched
- @deprecated
- Instead use searchExperimentsByNameWithPagination
-
+ @param limit
+ Amount of results to be fetched
+ @param offset
+ The starting point of the results to be fetched
Parameters:
+ - authzToken
- gatewayId
- userName
- expName
+ - limit
+ - offset
"""
- self.send_searchExperimentsByName(gatewayId, userName, expName)
+ self.send_searchExperimentsByName(authzToken, gatewayId, userName, expName, limit, offset)
return self.recv_searchExperimentsByName()
- def send_searchExperimentsByName(self, gatewayId, userName, expName):
+ def send_searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
self._oprot.writeMessageBegin('searchExperimentsByName', TMessageType.CALL, self._seqid)
args = searchExperimentsByName_args()
+ args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
args.expName = expName
+ args.limit = limit
+ args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -3266,9 +2934,11 @@ class Client(Iface):
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, "searchExperimentsByName failed: unknown result");
- def searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
+ def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
"""
Search Experiments by experiment name with pagination. Results will be sorted
based on creation time DESC
@@ -3277,8 +2947,8 @@ class Client(Iface):
Identifier of the requested gateway
@param userName
Username of the requested user
- @param expName
- Experiment name to be matched
+ @param description
+ Experiment description to be matched
@param limit
Amount of results to be fetched
@param offset
@@ -3288,27 +2958,27 @@ class Client(Iface):
- authzToken
- gatewayId
- userName
- - expName
+ - description
- limit
- offset
"""
- self.send_searchExperimentsByNameWithPagination(authzToken, gatewayId, userName, expName, limit, offset)
- return self.recv_searchExperimentsByNameWithPagination()
+ self.send_searchExperimentsByDesc(authzToken, gatewayId, userName, description, limit, offset)
+ return self.recv_searchExperimentsByDesc()
- def send_searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
- self._oprot.writeMessageBegin('searchExperimentsByNameWithPagination', TMessageType.CALL, self._seqid)
- args = searchExperimentsByNameWithPagination_args()
+ def send_searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
+ self._oprot.writeMessageBegin('searchExperimentsByDesc', TMessageType.CALL, self._seqid)
+ args = searchExperimentsByDesc_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.expName = expName
+ args.description = description
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByNameWithPagination(self):
+ def recv_searchExperimentsByDesc(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3316,7 +2986,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByNameWithPagination_result()
+ result = searchExperimentsByDesc_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3329,40 +2999,49 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByNameWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
- def searchExperimentsByDesc(self, gatewayId, userName, description):
+ def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
"""
- Search Experiments by experiment name
+ Search Experiments by application id with pagination. Results will be sorted
+ based on creation time DESC
@param gatewayId
Identifier of the requested gateway
@param userName
Username of the requested user
- @param description
- Experiment description to be matched
- @deprecated
- Instead use searchExperimentsByDescWithPagination
+ @param applicationId
+ Application id to be matched
+ @param limit
+ Amount of results to be fetched
+ @param offset
+ The starting point of the results to be fetched
Parameters:
+ - authzToken
- gatewayId
- userName
- - description
+ - applicationId
+ - limit
+ - offset
"""
- self.send_searchExperimentsByDesc(gatewayId, userName, description)
- return self.recv_searchExperimentsByDesc()
+ self.send_searchExperimentsByApplication(authzToken, gatewayId, userName, applicationId, limit, offset)
+ return self.recv_searchExperimentsByApplication()
- def send_searchExperimentsByDesc(self, gatewayId, userName, description):
- self._oprot.writeMessageBegin('searchExperimentsByDesc', TMessageType.CALL, self._seqid)
- args = searchExperimentsByDesc_args()
+ def send_searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+ self._oprot.writeMessageBegin('searchExperimentsByApplication', TMessageType.CALL, self._seqid)
+ args = searchExperimentsByApplication_args()
+ args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.description = description
+ args.applicationId = applicationId
+ args.limit = limit
+ args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByDesc(self):
+ def recv_searchExperimentsByApplication(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3370,7 +3049,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByDesc_result()
+ result = searchExperimentsByApplication_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3381,19 +3060,21 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
- def searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+ def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
"""
- Search Experiments by experiment name with pagination. Results will be sorted
+ Search Experiments by experiment status with pagination. Results will be sorted
based on creation time DESC
@param gatewayId
Identifier of the requested gateway
@param userName
Username of the requested user
- @param description
- Experiment description to be matched
+ @param experimentState
+ Experiement state to be matched
@param limit
Amount of results to be fetched
@param offset
@@ -3403,27 +3084,27 @@ class Client(Iface):
- authzToken
- gatewayId
- userName
- - description
+ - experimentState
- limit
- offset
"""
- self.send_searchExperimentsByDescWithPagination(authzToken, gatewayId, userName, description, limit, offset)
- return self.recv_searchExperimentsByDescWithPagination()
+ self.send_searchExperimentsByStatus(authzToken, gatewayId, userName, experimentState, limit, offset)
+ return self.recv_searchExperimentsByStatus()
- def send_searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
- self._oprot.writeMessageBegin('searchExperimentsByDescWithPagination', TMessageType.CALL, self._seqid)
- args = searchExperimentsByDescWithPagination_args()
+ def send_searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+ self._oprot.writeMessageBegin('searchExperimentsByStatus', TMessageType.CALL, self._seqid)
+ args = searchExperimentsByStatus_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.description = description
+ args.experimentState = experimentState
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByDescWithPagination(self):
+ def recv_searchExperimentsByStatus(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3431,7 +3112,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByDescWithPagination_result()
+ result = searchExperimentsByStatus_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3444,40 +3125,53 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDescWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
- def searchExperimentsByApplication(self, gatewayId, userName, applicationId):
+ def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
"""
- Search Experiments by application id
+ Search Experiments by experiment creation time with pagination. Results will be sorted
+ based on creation time DESC
@param gatewayId
Identifier of the requested gateway
@param userName
Username of the requested user
- @param applicationId
- Application id to be matched
- @deprecated
- Instead use searchExperimentsByApplicationWithPagination
+ @param fromTime
+ Start time of the experiments creation time
+ @param toTime
+ End time of the experiement creation time
+ @param limit
+ Amount of results to be fetched
+ @param offset
+ The starting point of the results to be fetched
Parameters:
+ - authzToken
- gatewayId
- userName
- - applicationId
+ - fromTime
+ - toTime
+ - limit
+ - offset
"""
- self.send_searchExperimentsByApplication(gatewayId, userName, applicationId)
- return self.recv_searchExperimentsByApplication()
+ self.send_searchExperimentsByCreationTime(authzToken, gatewayId, userName, fromTime, toTime, limit, offset)
+ return self.recv_searchExperimentsByCreationTime()
- def send_searchExperimentsByApplication(self, gatewayId, userName, applicationId):
- self._oprot.writeMessageBegin('searchExperimentsByApplication', TMessageType.CALL, self._seqid)
- args = searchExperimentsByApplication_args()
+ def send_searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
+ self._oprot.writeMessageBegin('searchExperimentsByCreationTime', TMessageType.CALL, self._seqid)
+ args = searchExperimentsByCreationTime_args()
+ args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.applicationId = applicationId
+ args.fromTime = fromTime
+ args.toTime = toTime
+ args.limit = limit
+ args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByApplication(self):
+ def recv_searchExperimentsByCreationTime(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3485,7 +3179,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByApplication_result()
+ result = searchExperimentsByCreationTime_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3496,19 +3190,21 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
- def searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+ def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
- Search Experiments by application id with pagination. Results will be sorted
+ Search Experiments by using multiple filter criteria with pagination. Results will be sorted
based on creation time DESC
@param gatewayId
Identifier of the requested gateway
@param userName
Username of the requested user
- @param applicationId
- Application id to be matched
+ @param filters
+ map of multiple filter criteria.
@param limit
Amount of results to be fetched
@param offset
@@ -3518,27 +3214,27 @@ class Client(Iface):
- authzToken
- gatewayId
- userName
- - applicationId
+ - filters
- limit
- offset
"""
- self.send_searchExperimentsByApplicationWithPagination(authzToken, gatewayId, userName, applicationId, limit, offset)
- return self.recv_searchExperimentsByApplicationWithPagination()
+ self.send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset)
+ return self.recv_searchExperiments()
- def send_searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
- self._oprot.writeMessageBegin('searchExperimentsByApplicationWithPagination', TMessageType.CALL, self._seqid)
- args = searchExperimentsByApplicationWithPagination_args()
+ def send_searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
+ self._oprot.writeMessageBegin('searchExperiments', TMessageType.CALL, self._seqid)
+ args = searchExperiments_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.applicationId = applicationId
+ args.filters = filters
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByApplicationWithPagination(self):
+ def recv_searchExperiments(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3546,7 +3242,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByApplicationWithPagination_result()
+ result = searchExperiments_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3559,40 +3255,40 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplicationWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperiments failed: unknown result");
- def searchExperimentsByStatus(self, gatewayId, userName, experimentState):
+ def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
"""
- Search Experiments by experiment status
-
+ Get Experiment Statisitics for the given gateway for a specific time period
@param gatewayId
Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param experimentState
- Experiement state to be matched
- @deprecated
- Instead use searchExperimentsByStatusWithPagination
+ @param fromTime
+ Starting date time
+ @param toTime
+ Ending data time
+
Parameters:
+ - authzToken
- gatewayId
- - userName
- - experimentState
+ - fromTime
+ - toTime
"""
- self.send_searchExperimentsByStatus(gatewayId, userName, experimentState)
- return self.recv_searchExperimentsByStatus()
+ self.send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime)
+ return self.recv_getExperimentStatistics()
- def send_searchExperimentsByStatus(self, gatewayId, userName, experimentState):
- self._oprot.writeMessageBegin('searchExperimentsByStatus', TMessageType.CALL, self._seqid)
- args = searchExperimentsByStatus_args()
+ def send_getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
+ self._oprot.writeMessageBegin('getExperimentStatistics', TMessageType.CALL, self._seqid)
+ args = getExperimentStatistics_args()
+ args.authzToken = authzToken
args.gatewayId = gatewayId
- args.userName = userName
- args.experimentState = experimentState
+ args.fromTime = fromTime
+ args.toTime = toTime
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByStatus(self):
+ def recv_getExperimentStatistics(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3600,7 +3296,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByStatus_result()
+ result = getExperimentStatistics_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3611,19 +3307,17 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getExperimentStatistics failed: unknown result");
- def searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+ def getExperimentsInProject(self, authzToken, projectId, limit, offset):
"""
- Search Experiments by experiment status with pagination. Results will be sorted
+ Get Experiments within project with pagination. Results will be sorted
based on creation time DESC
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param experimentState
- Experiement state to be matched
+ @param projectId
+ Identifier of the project
@param limit
Amount of results to be fetched
@param offset
@@ -3631,29 +3325,25 @@ class Client(Iface):
Parameters:
- authzToken
- - gatewayId
- - userName
- - experimentState
+ - projectId
- limit
- offset
"""
- self.send_searchExperimentsByStatusWithPagination(authzToken, gatewayId, userName, experimentState, limit, offset)
- return self.recv_searchExperimentsByStatusWithPagination()
+ self.send_getExperimentsInProject(authzToken, projectId, limit, offset)
+ return self.recv_getExperimentsInProject()
- def send_searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
- self._oprot.writeMessageBegin('searchExperimentsByStatusWithPagination', TMessageType.CALL, self._seqid)
- args = searchExperimentsByStatusWithPagination_args()
+ def send_getExperimentsInProject(self, authzToken, projectId, limit, offset):
+ self._oprot.writeMessageBegin('getExperimentsInProject', TMessageType.CALL, self._seqid)
+ args = getExperimentsInProject_args()
args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.userName = userName
- args.experimentState = experimentState
+ args.projectId = projectId
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByStatusWithPagination(self):
+ def recv_getExperimentsInProject(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3661,7 +3351,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByStatusWithPagination_result()
+ result = getExperimentsInProject_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3672,79 +3362,21 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
+ if result.pnfe is not None:
+ raise result.pnfe
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatusWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getExperimentsInProject failed: unknown result");
- def searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
+ def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
"""
- Search Experiments by experiment creation time
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param fromTime
- Start time of the experiments creation time
- @param toTime
- End time of the experiement creation time
- @deprecated
- Instead use searchExperimentsByCreationTimeWithPagination
-
- Parameters:
- - gatewayId
- - userName
- - fromTime
- - toTime
- """
- self.send_searchExperimentsByCreationTime(gatewayId, userName, fromTime, toTime)
- return self.recv_searchExperimentsByCreationTime()
-
- def send_searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
- self._oprot.writeMessageBegin('searchExperimentsByCreationTime', TMessageType.CALL, self._seqid)
- args = searchExperimentsByCreationTime_args()
- args.gatewayId = gatewayId
- args.userName = userName
- args.fromTime = fromTime
- args.toTime = toTime
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchExperimentsByCreationTime(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperimentsByCreationTime_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
-
- def searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
- """
- Search Experiments by experiment creation time with pagination. Results will be sorted
+ Get experiments by user with pagination. Results will be sorted
based on creation time DESC
@param gatewayId
- Identifier of the requested gateway
+ Identifier of the requesting gateway
@param userName
Username of the requested user
- @param fromTime
- Start time of the experiments creation time
- @param toTime
- End time of the experiement creation time
@param limit
Amount of results to be fetched
@param offset
@@ -3754,29 +3386,25 @@ class Client(Iface):
- authzToken
- gatewayId
- userName
- - fromTime
- - toTime
- limit
- offset
"""
- self.send_searchExperimentsByCreationTimeWithPagination(authzToken, gatewayId, userName, fromTime, toTime, limit, offset)
- return self.recv_searchExperimentsByCreationTimeWithPagination()
+ self.send_getUserExperiments(authzToken, gatewayId, userName, limit, offset)
+ return self.recv_getUserExperiments()
- def send_searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
- self._oprot.writeMessageBegin('searchExperimentsByCreationTimeWithPagination', TMessageType.CALL, self._seqid)
- args = searchExperimentsByCreationTimeWithPagination_args()
+ def send_getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
+ self._oprot.writeMessageBegin('getUserExperiments', TMessageType.CALL, self._seqid)
+ args = getUserExperiments_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.fromTime = fromTime
- args.toTime = toTime
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchExperimentsByCreationTimeWithPagination(self):
+ def recv_getUserExperiments(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -3784,7 +3412,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchExperimentsByCreationTimeWithPagination_result()
+ result = getUserExperiments_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -3797,334 +3425,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTimeWithPagination failed: unknown result");
-
- def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
- """
- Search Experiments by using multiple filter criteria with pagination. Results will be sorted
- based on creation time DESC
-
- @param gatewayId
- Identifier of the requested gateway
- @param userName
- Username of the requested user
- @param filters
- map of multiple filter criteria.
- @param limit
- Amount of results to be fetched
- @param offset
- The starting point of the results to be fetched
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - filters
- - limit
- - offset
- """
- self.send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset)
- return self.recv_searchExperiments()
-
- def send_searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
- self._oprot.writeMessageBegin('searchExperiments', TMessageType.CALL, self._seqid)
- args = searchExperiments_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.userName = userName
- args.filters = filters
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchExperiments(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperiments_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, "searchExperiments failed: unknown result");
-
- def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
- """
- Get Experiment Statisitics for the given gateway for a specific time period
- @param gatewayId
- Identifier of the requested gateway
- @param fromTime
- Starting date time
- @param toTime
- Ending data time
-
-
- Parameters:
- - authzToken
- - gatewayId
- - fromTime
- - toTime
- """
- self.send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime)
- return self.recv_getExperimentStatistics()
-
- def send_getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
- self._oprot.writeMessageBegin('getExperimentStatistics', TMessageType.CALL, self._seqid)
- args = getExperimentStatistics_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.fromTime = fromTime
- args.toTime = toTime
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getExperimentStatistics(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getExperimentStatistics_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, "getExperimentStatistics failed: unknown result");
-
- def getAllExperimentsInProject(self, projectId):
- """
- Get all Experiments within a Project
-
- @param projectId
- Identifier of the project
- @deprecated
- Instead use getAllExperimentsInProjectWithPagination
-
- Parameters:
- - projectId
- """
- self.send_getAllExperimentsInProject(projectId)
- return self.recv_getAllExperimentsInProject()
-
- def send_getAllExperimentsInProject(self, projectId):
- self._oprot.writeMessageBegin('getAllExperimentsInProject', TMessageType.CALL, self._seqid)
- args = getAllExperimentsInProject_args()
- args.projectId = projectId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllExperimentsInProject(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllExperimentsInProject_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.pnfe is not None:
- raise result.pnfe
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllExperimentsInProject failed: unknown result");
-
- def getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
- """
- Get all Experiments within project with pagination. Results will be sorted
- based on creation time DESC
-
- @param projectId
- Identifier of the project
- @param limit
- Amount of results to be fetched
- @param offset
- The starting point of the results to be fetched
-
- Parameters:
- - authzToken
- - projectId
- - limit
- - offset
- """
- self.send_getAllExperimentsInProjectWithPagination(authzToken, projectId, limit, offset)
- return self.recv_getAllExperimentsInProjectWithPagination()
-
- def send_getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
- self._oprot.writeMessageBegin('getAllExperimentsInProjectWithPagination', TMessageType.CALL, self._seqid)
- args = getAllExperimentsInProjectWithPagination_args()
- args.authzToken = authzToken
- args.projectId = projectId
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllExperimentsInProjectWithPagination(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllExperimentsInProjectWithPagination_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.pnfe is not None:
- raise result.pnfe
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllExperimentsInProjectWithPagination failed: unknown result");
-
- def getAllUserExperiments(self, gatewayId, userName):
- """
- Get all Experiments by user
-
- @param gatewayId
- Identifier of the requesting gateway
- @param userName
- Username of the requested user
- @deprecated
- Instead use getAllUserExperimentsWithPagination
-
- Parameters:
- - gatewayId
- - userName
- """
- self.send_getAllUserExperiments(gatewayId, userName)
- return self.recv_getAllUserExperiments()
-
- def send_getAllUserExperiments(self, gatewayId, userName):
- self._oprot.writeMessageBegin('getAllUserExperiments', TMessageType.CALL, self._seqid)
- args = getAllUserExperiments_args()
- args.gatewayId = gatewayId
- args.userName = userName
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllUserExperiments(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllUserExperiments_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserExperiments failed: unknown result");
-
- def getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
- """
- Get all Experiments by user pagination. Results will be sorted
- based on creation time DESC
-
- @param gatewayId
- Identifier of the requesting gateway
- @param userName
- Username of the requested user
- @param limit
- Amount of results to be fetched
- @param offset
- The starting point of the results to be fetched
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - limit
- - offset
- """
- self.send_getAllUserExperimentsWithPagination(authzToken, gatewayId, userName, limit, offset)
- return self.recv_getAllUserExperimentsWithPagination()
-
- def send_getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
- self._oprot.writeMessageBegin('getAllUserExperimentsWithPagination', TMessageType.CALL, self._seqid)
- args = getAllUserExperimentsWithPagination_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.userName = userName
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllUserExperimentsWithPagination(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllUserExperimentsWithPagination_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, "getAllUserExperimentsWithPagination failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserExperiments failed: unknown result");
def createExperiment(self, authzToken, gatewayId, experiment):
"""
@@ -8816,28 +8117,18 @@ class Processor(Iface, TProcessor):
self._processMap["updateProject"] = Processor.process_updateProject
self._processMap["getProject"] = Processor.process_getProject
self._processMap["deleteProject"] = Processor.process_deleteProject
- self._processMap["getAllUserProjects"] = Processor.process_getAllUserProjects
- self._processMap["getAllUserProjectsWithPagination"] = Processor.process_getAllUserProjectsWithPagination
+ self._processMap["getUserProjects"] = Processor.process_getUserProjects
self._processMap["searchProjectsByProjectName"] = Processor.process_searchProjectsByProjectName
- self._processMap["searchProjectsByProjectNameWithPagination"] = Processor.process_searchProjectsByProjectNameWithPagination
self._processMap["searchProjectsByProjectDesc"] = Processor.process_searchProjectsByProjectDesc
- self._processMap["searchProjectsByProjectDescWithPagination"] = Processor.process_searchProjectsByProjectDescWithPagination
self._processMap["searchExperimentsByName"] = Processor.process_searchExperimentsByName
- self._processMap["searchExperimentsByNameWithPagination"] = Processor.process_searchExperimentsByNameWithPagination
self._processMap["searchExperimentsByDesc"] = Processor.process_searchExperimentsByDesc
- self._processMap["searchExperimentsByDescWithPagination"] = Processor.process_searchExperimentsByDescWithPagination
self._processMap["searchExperimentsByApplication"] = Processor.process_searchExperimentsByApplication
- self._processMap["searchExperimentsByApplicationWithPagination"] = Processor.process_searchExperimentsByApplicationWithPagination
self._processMap["searchExperimentsByStatus"] = Processor.process_searchExperimentsByStatus
- self._processMap["searchExperimentsByStatusWithPagination"] = Processor.process_searchExperimentsByStatusWithPagination
self._processMap["searchExperimentsByCreationTime"] = Processor.process_searchExperimentsByCreationTime
- self._processMap["searchExperimentsByCreationTimeWithPagination"] = Processor.process_searchExperimentsByCreationTimeWithPagination
self._processMap["searchExperiments"] = Processor.process_searchExperiments
self._processMap["getExperimentStatistics"] = Processor.process_getExperimentStatistics
- self._processMap["getAllExperimentsInProject"] = Processor.process_getAllExperimentsInProject
- self._processMap["getAllExperimentsInProjectWithPagination"] = Processor.process_getAllExperimentsInProjectWithPagination
- self._processMap["getAllUserExperiments"] = Processor.process_getAllUserExperiments
- self._processMap["getAllUserExperimentsWithPagination"] = Processor.process_getAllUserExperimentsWithPagination
+ self._processMap["getExperimentsInProject"] = Processor.process_getExperimentsInProject
+ self._processMap["getUserExperiments"] = Processor.process_getUserExperiments
self._processMap["createExperiment"] = Processor.process_createExperiment
self._processMap["getExperiment"] = Processor.process_getExperiment
self._processMap["updateExperiment"] = Processor.process_updateExperiment
@@ -9225,31 +8516,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllUserProjects(self, seqid, iprot, oprot):
- args = getAllUserProjects_args()
+ def process_getUserProjects(self, seqid, iprot, oprot):
+ args = getUserProjects_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllUserProjects_result()
+ result = getUserProjects_result()
try:
- result.success = self._handler.getAllUserProjects(args.gatewayId, args.userName)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("getAllUserProjects", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllUserProjectsWithPagination(self, seqid, iprot, oprot):
- args = getAllUserProjectsWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllUserProjectsWithPagination_result()
- try:
- result.success = self._handler.getAllUserProjectsWithPagination(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
+ result.success = self._handler.getUserProjects(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9258,7 +8531,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getAllUserProjectsWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getUserProjects", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9269,25 +8542,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchProjectsByProjectName_result()
try:
- result.success = self._handler.searchProjectsByProjectName(args.gatewayId, args.userName, args.projectName)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchProjectsByProjectName", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchProjectsByProjectNameWithPagination(self, seqid, iprot, oprot):
- args = searchProjectsByProjectNameWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchProjectsByProjectNameWithPagination_result()
- try:
- result.success = self._handler.searchProjectsByProjectNameWithPagination(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset)
+ result.success = self._handler.searchProjectsByProjectName(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9296,7 +8551,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchProjectsByProjectNameWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchProjectsByProjectName", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9307,25 +8562,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchProjectsByProjectDesc_result()
try:
- result.success = self._handler.searchProjectsByProjectDesc(args.gatewayId, args.userName, args.description)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchProjectsByProjectDesc", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchProjectsByProjectDescWithPagination(self, seqid, iprot, oprot):
- args = searchProjectsByProjectDescWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchProjectsByProjectDescWithPagination_result()
- try:
- result.success = self._handler.searchProjectsByProjectDescWithPagination(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
+ result.success = self._handler.searchProjectsByProjectDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9334,7 +8571,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchProjectsByProjectDescWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchProjectsByProjectDesc", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9345,25 +8582,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchExperimentsByName_result()
try:
- result.success = self._handler.searchExperimentsByName(args.gatewayId, args.userName, args.expName)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchExperimentsByName", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByNameWithPagination(self, seqid, iprot, oprot):
- args = searchExperimentsByNameWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByNameWithPagination_result()
- try:
- result.success = self._handler.searchExperimentsByNameWithPagination(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset)
+ result.success = self._handler.searchExperimentsByName(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9372,7 +8591,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchExperimentsByNameWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchExperimentsByName", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9383,25 +8602,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchExperimentsByDesc_result()
try:
- result.success = self._handler.searchExperimentsByDesc(args.gatewayId, args.userName, args.description)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchExperimentsByDesc", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByDescWithPagination(self, seqid, iprot, oprot):
- args = searchExperimentsByDescWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByDescWithPagination_result()
- try:
- result.success = self._handler.searchExperimentsByDescWithPagination(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
+ result.success = self._handler.searchExperimentsByDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9410,7 +8611,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchExperimentsByDescWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchExperimentsByDesc", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9421,25 +8622,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchExperimentsByApplication_result()
try:
- result.success = self._handler.searchExperimentsByApplication(args.gatewayId, args.userName, args.applicationId)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchExperimentsByApplication", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByApplicationWithPagination(self, seqid, iprot, oprot):
- args = searchExperimentsByApplicationWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByApplicationWithPagination_result()
- try:
- result.success = self._handler.searchExperimentsByApplicationWithPagination(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset)
+ result.success = self._handler.searchExperimentsByApplication(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9448,7 +8631,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchExperimentsByApplicationWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchExperimentsByApplication", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9459,25 +8642,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchExperimentsByStatus_result()
try:
- result.success = self._handler.searchExperimentsByStatus(args.gatewayId, args.userName, args.experimentState)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchExperimentsByStatus", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByStatusWithPagination(self, seqid, iprot, oprot):
- args = searchExperimentsByStatusWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByStatusWithPagination_result()
- try:
- result.success = self._handler.searchExperimentsByStatusWithPagination(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset)
+ result.success = self._handler.searchExperimentsByStatus(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9486,7 +8651,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchExperimentsByStatusWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchExperimentsByStatus", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9497,25 +8662,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = searchExperimentsByCreationTime_result()
try:
- result.success = self._handler.searchExperimentsByCreationTime(args.gatewayId, args.userName, args.fromTime, args.toTime)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("searchExperimentsByCreationTime", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByCreationTimeWithPagination(self, seqid, iprot, oprot):
- args = searchExperimentsByCreationTimeWithPagination_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByCreationTimeWithPagination_result()
- try:
- result.success = self._handler.searchExperimentsByCreationTimeWithPagination(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset)
+ result.success = self._handler.searchExperimentsByCreationTime(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9524,7 +8671,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("searchExperimentsByCreationTimeWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("searchExperimentsByCreationTime", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -9569,33 +8716,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllExperimentsInProject(self, seqid, iprot, oprot):
- args = getAllExperimentsInProject_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllExperimentsInProject_result()
- try:
- result.success = self._handler.getAllExperimentsInProject(args.projectId)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- except apache.airavata.api.error.ttypes.ProjectNotFoundException, pnfe:
- result.pnfe = pnfe
- oprot.writeMessageBegin("getAllExperimentsInProject", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllExperimentsInProjectWithPagination(self, seqid, iprot, oprot):
- args = getAllExperimentsInProjectWithPagination_args()
+ def process_getExperimentsInProject(self, seqid, iprot, oprot):
+ args = getExperimentsInProject_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllExperimentsInProjectWithPagination_result()
+ result = getExperimentsInProject_result()
try:
- result.success = self._handler.getAllExperimentsInProjectWithPagination(args.authzToken, args.projectId, args.limit, args.offset)
+ result.success = self._handler.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9606,36 +8733,18 @@ class Processor(Iface, TProcessor):
result.pnfe = pnfe
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getAllExperimentsInProjectWithPagination", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllUserExperiments(self, seqid, iprot, oprot):
- args = getAllUserExperiments_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllUserExperiments_result()
- try:
- result.success = self._handler.getAllUserExperiments(args.gatewayId, args.userName)
- except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException, ace:
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
- result.ase = ase
- oprot.writeMessageBegin("getAllUserExperiments", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getExperimentsInProject", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllUserExperimentsWithPagination(self, seqid, iprot, oprot):
- args = getAllUserExperimentsWithPagination_args()
+ def process_getUserExperiments(self, seqid, iprot, oprot):
+ args = getUserExperiments_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllUserExperimentsWithPagination_result()
+ result = getUserExperiments_result()
try:
- result.success = self._handler.getAllUserExperimentsWithPagination(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
+ result.success = self._handler.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9644,7 +8753,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getAllUserExperimentsWithPagination", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getUserExperiments", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -14235,2404 +13344,12 @@ class deleteProject_result:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRUCT:
- self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
- self.pnfe.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('deleteProject_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.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.pnfe is not None:
- oprot.writeFieldBegin('pnfe', TType.STRUCT, 4)
- self.pnfe.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.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.pnfe)
- 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 getAllUserProjects_args:
- """
- Attributes:
- - gatewayId
- - userName
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
- )
-
- def __init__(self, gatewayId=None, userName=None,):
- self.gatewayId = gatewayId
- self.userName = userName
-
- 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.STRING:
- self.gatewayId = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.userName = iprot.readString();
- 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('getAllUserProjects_args')
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)
<TRUNCATED>
[04/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
index 7a574d4..55d6b6d 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
@@ -35,7 +35,7 @@ final class Constant extends \Thrift\Type\TConstant {
* in a change to major/minor version numbers.
*
*/
-"0.15.0";
+"0.16.0";
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 3d41aa7..99b3ee1 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
@@ -38,28 +38,18 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' void updateProject(AuthzToken authzToken, string projectId, Project updatedProject)')
print(' Project getProject(AuthzToken authzToken, string projectId)')
print(' bool deleteProject(AuthzToken authzToken, string projectId)')
- print(' getAllUserProjects(string gatewayId, string userName)')
- print(' getAllUserProjectsWithPagination(AuthzToken authzToken, string gatewayId, string userName, i32 limit, i32 offset)')
- print(' searchProjectsByProjectName(string gatewayId, string userName, string projectName)')
- print(' searchProjectsByProjectNameWithPagination(AuthzToken authzToken, string gatewayId, string userName, string projectName, i32 limit, i32 offset)')
- print(' searchProjectsByProjectDesc(string gatewayId, string userName, string description)')
- print(' searchProjectsByProjectDescWithPagination(AuthzToken authzToken, string gatewayId, string userName, string description, i32 limit, i32 offset)')
- print(' searchExperimentsByName(string gatewayId, string userName, string expName)')
- print(' searchExperimentsByNameWithPagination(AuthzToken authzToken, string gatewayId, string userName, string expName, i32 limit, i32 offset)')
- print(' searchExperimentsByDesc(string gatewayId, string userName, string description)')
- print(' searchExperimentsByDescWithPagination(AuthzToken authzToken, string gatewayId, string userName, string description, i32 limit, i32 offset)')
- print(' searchExperimentsByApplication(string gatewayId, string userName, string applicationId)')
- print(' searchExperimentsByApplicationWithPagination(AuthzToken authzToken, string gatewayId, string userName, string applicationId, i32 limit, i32 offset)')
- print(' searchExperimentsByStatus(string gatewayId, string userName, ExperimentState experimentState)')
- print(' searchExperimentsByStatusWithPagination(AuthzToken authzToken, string gatewayId, string userName, ExperimentState experimentState, i32 limit, i32 offset)')
- print(' searchExperimentsByCreationTime(string gatewayId, string userName, i64 fromTime, i64 toTime)')
- print(' searchExperimentsByCreationTimeWithPagination(AuthzToken authzToken, string gatewayId, string userName, i64 fromTime, i64 toTime, i32 limit, i32 offset)')
+ print(' getUserProjects(AuthzToken authzToken, string gatewayId, string userName, i32 limit, i32 offset)')
+ print(' searchProjectsByProjectName(AuthzToken authzToken, string gatewayId, string userName, string projectName, i32 limit, i32 offset)')
+ print(' searchProjectsByProjectDesc(AuthzToken authzToken, string gatewayId, string userName, string description, i32 limit, i32 offset)')
+ print(' searchExperimentsByName(AuthzToken authzToken, string gatewayId, string userName, string expName, i32 limit, i32 offset)')
+ print(' searchExperimentsByDesc(AuthzToken authzToken, string gatewayId, string userName, string description, i32 limit, i32 offset)')
+ print(' searchExperimentsByApplication(AuthzToken authzToken, string gatewayId, string userName, string applicationId, i32 limit, i32 offset)')
+ print(' searchExperimentsByStatus(AuthzToken authzToken, string gatewayId, string userName, ExperimentState experimentState, i32 limit, i32 offset)')
+ print(' searchExperimentsByCreationTime(AuthzToken authzToken, string gatewayId, string userName, i64 fromTime, i64 toTime, i32 limit, i32 offset)')
print(' searchExperiments(AuthzToken authzToken, string gatewayId, string userName, filters, i32 limit, i32 offset)')
print(' ExperimentStatistics getExperimentStatistics(AuthzToken authzToken, string gatewayId, i64 fromTime, i64 toTime)')
- print(' getAllExperimentsInProject(string projectId)')
- print(' getAllExperimentsInProjectWithPagination(AuthzToken authzToken, string projectId, i32 limit, i32 offset)')
- print(' getAllUserExperiments(string gatewayId, string userName)')
- print(' getAllUserExperimentsWithPagination(AuthzToken authzToken, string gatewayId, string userName, i32 limit, i32 offset)')
+ print(' getExperimentsInProject(AuthzToken authzToken, string projectId, i32 limit, i32 offset)')
+ print(' getUserExperiments(AuthzToken authzToken, string gatewayId, string userName, i32 limit, i32 offset)')
print(' string createExperiment(AuthzToken authzToken, string gatewayId, ExperimentModel experiment)')
print(' ExperimentModel getExperiment(AuthzToken authzToken, string airavataExperimentId)')
print(' void updateExperiment(AuthzToken authzToken, string airavataExperimentId, ExperimentModel experiment)')
@@ -291,101 +281,53 @@ elif cmd == 'deleteProject':
sys.exit(1)
pp.pprint(client.deleteProject(eval(args[0]),args[1],))
-elif cmd == 'getAllUserProjects':
- if len(args) != 2:
- print('getAllUserProjects requires 2 args')
- sys.exit(1)
- pp.pprint(client.getAllUserProjects(args[0],args[1],))
-
-elif cmd == 'getAllUserProjectsWithPagination':
+elif cmd == 'getUserProjects':
if len(args) != 5:
- print('getAllUserProjectsWithPagination requires 5 args')
+ print('getUserProjects requires 5 args')
sys.exit(1)
- pp.pprint(client.getAllUserProjectsWithPagination(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),))
+ pp.pprint(client.getUserProjects(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),))
elif cmd == 'searchProjectsByProjectName':
- if len(args) != 3:
- print('searchProjectsByProjectName requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchProjectsByProjectName(args[0],args[1],args[2],))
-
-elif cmd == 'searchProjectsByProjectNameWithPagination':
if len(args) != 6:
- print('searchProjectsByProjectNameWithPagination requires 6 args')
+ print('searchProjectsByProjectName requires 6 args')
sys.exit(1)
- pp.pprint(client.searchProjectsByProjectNameWithPagination(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchProjectsByProjectName(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
elif cmd == 'searchProjectsByProjectDesc':
- if len(args) != 3:
- print('searchProjectsByProjectDesc requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchProjectsByProjectDesc(args[0],args[1],args[2],))
-
-elif cmd == 'searchProjectsByProjectDescWithPagination':
if len(args) != 6:
- print('searchProjectsByProjectDescWithPagination requires 6 args')
+ print('searchProjectsByProjectDesc requires 6 args')
sys.exit(1)
- pp.pprint(client.searchProjectsByProjectDescWithPagination(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchProjectsByProjectDesc(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperimentsByName':
- if len(args) != 3:
- print('searchExperimentsByName requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchExperimentsByName(args[0],args[1],args[2],))
-
-elif cmd == 'searchExperimentsByNameWithPagination':
if len(args) != 6:
- print('searchExperimentsByNameWithPagination requires 6 args')
+ print('searchExperimentsByName requires 6 args')
sys.exit(1)
- pp.pprint(client.searchExperimentsByNameWithPagination(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchExperimentsByName(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperimentsByDesc':
- if len(args) != 3:
- print('searchExperimentsByDesc requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchExperimentsByDesc(args[0],args[1],args[2],))
-
-elif cmd == 'searchExperimentsByDescWithPagination':
if len(args) != 6:
- print('searchExperimentsByDescWithPagination requires 6 args')
+ print('searchExperimentsByDesc requires 6 args')
sys.exit(1)
- pp.pprint(client.searchExperimentsByDescWithPagination(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchExperimentsByDesc(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperimentsByApplication':
- if len(args) != 3:
- print('searchExperimentsByApplication requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchExperimentsByApplication(args[0],args[1],args[2],))
-
-elif cmd == 'searchExperimentsByApplicationWithPagination':
if len(args) != 6:
- print('searchExperimentsByApplicationWithPagination requires 6 args')
+ print('searchExperimentsByApplication requires 6 args')
sys.exit(1)
- pp.pprint(client.searchExperimentsByApplicationWithPagination(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchExperimentsByApplication(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperimentsByStatus':
- if len(args) != 3:
- print('searchExperimentsByStatus requires 3 args')
- sys.exit(1)
- pp.pprint(client.searchExperimentsByStatus(args[0],args[1],eval(args[2]),))
-
-elif cmd == 'searchExperimentsByStatusWithPagination':
if len(args) != 6:
- print('searchExperimentsByStatusWithPagination requires 6 args')
+ print('searchExperimentsByStatus requires 6 args')
sys.exit(1)
- pp.pprint(client.searchExperimentsByStatusWithPagination(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchExperimentsByStatus(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperimentsByCreationTime':
- if len(args) != 4:
- print('searchExperimentsByCreationTime requires 4 args')
- sys.exit(1)
- pp.pprint(client.searchExperimentsByCreationTime(args[0],args[1],eval(args[2]),eval(args[3]),))
-
-elif cmd == 'searchExperimentsByCreationTimeWithPagination':
if len(args) != 7:
- print('searchExperimentsByCreationTimeWithPagination requires 7 args')
+ print('searchExperimentsByCreationTime requires 7 args')
sys.exit(1)
- pp.pprint(client.searchExperimentsByCreationTimeWithPagination(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),eval(args[5]),eval(args[6]),))
+ pp.pprint(client.searchExperimentsByCreationTime(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),eval(args[5]),eval(args[6]),))
elif cmd == 'searchExperiments':
if len(args) != 6:
@@ -399,29 +341,17 @@ elif cmd == 'getExperimentStatistics':
sys.exit(1)
pp.pprint(client.getExperimentStatistics(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-elif cmd == 'getAllExperimentsInProject':
- if len(args) != 1:
- print('getAllExperimentsInProject requires 1 args')
- sys.exit(1)
- pp.pprint(client.getAllExperimentsInProject(args[0],))
-
-elif cmd == 'getAllExperimentsInProjectWithPagination':
+elif cmd == 'getExperimentsInProject':
if len(args) != 4:
- print('getAllExperimentsInProjectWithPagination requires 4 args')
- sys.exit(1)
- pp.pprint(client.getAllExperimentsInProjectWithPagination(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-
-elif cmd == 'getAllUserExperiments':
- if len(args) != 2:
- print('getAllUserExperiments requires 2 args')
+ print('getExperimentsInProject requires 4 args')
sys.exit(1)
- pp.pprint(client.getAllUserExperiments(args[0],args[1],))
+ pp.pprint(client.getExperimentsInProject(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-elif cmd == 'getAllUserExperimentsWithPagination':
+elif cmd == 'getUserExperiments':
if len(args) != 5:
- print('getAllUserExperimentsWithPagination requires 5 args')
+ print('getUserExperiments requires 5 args')
sys.exit(1)
- pp.pprint(client.getAllUserExperimentsWithPagination(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),))
+ pp.pprint(client.getUserExperiments(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),))
elif cmd == 'createExperiment':
if len(args) != 3:
[07/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 b891dd0..bd3cd79 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
@@ -107,22 +107,6 @@ class AiravataIf {
virtual bool deleteProject(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& projectId) = 0;
/**
- * * Get all Project by user
- * *
- * * @param gatewayId
- * * The identifier for the requested gateway.
- * *
- * * @param userName
- * * The Project Object described in the workspace_model
- * * @deprecated Instead use getAllUserProjectsWithPagination
- * *
- *
- * @param gatewayId
- * @param userName
- */
- virtual void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName) = 0;
-
- /**
* * Get all Project by user with pagination. Results will be ordered based
* * on creation time DESC
* *
@@ -142,24 +126,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void getAllUserProjectsWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param projectName
- */
- virtual void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName, const std::string& projectName) = 0;
+ virtual void getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
/**
* Get all Project for user by project name with pagination.Results will be ordered based
@@ -183,23 +150,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchProjectsByProjectNameWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& projectName, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- virtual void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) = 0;
+ virtual void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& projectName, const int32_t limit, const int32_t offset) = 0;
/**
* Search and get all Projects for user by project description with pagination. Results
@@ -223,26 +174,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchProjectsByProjectDescWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param useNname
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- *
- * @param gatewayId
- * @param userName
- * @param expName
- */
- virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) = 0;
+ virtual void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -266,25 +198,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) = 0;
+ virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -308,25 +222,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplicationWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param applicationId
- */
- virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) = 0;
+ virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by application id with pagination. Results will be sorted
@@ -350,25 +246,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiement state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param experimentState
- */
- virtual void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState) = 0;
+ virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment status with pagination. Results will be sorted
@@ -392,28 +270,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) = 0;
-
- /**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTimeWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- */
- virtual void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) = 0;
+ virtual void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment creation time with pagination. Results will be sorted
@@ -440,7 +297,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
@@ -484,19 +341,7 @@ class AiravataIf {
virtual void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) = 0;
/**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- *
- * @param projectId
- */
- virtual void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId) = 0;
-
- /**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -511,25 +356,10 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void getAllExperimentsInProjectWithPagination(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) = 0;
-
- /**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- *
- * @param gatewayId
- * @param userName
- */
- virtual void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName) = 0;
+ virtual void 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) = 0;
/**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get experiments by user with pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -547,7 +377,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void getAllUserExperimentsWithPagination(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) = 0;
+ virtual void 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) = 0;
/**
* Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
@@ -1931,52 +1761,28 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */) {
- return;
- }
- void getAllUserProjectsWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const int32_t /* limit */, const int32_t /* offset */) {
- return;
- }
- void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* projectName */) {
- return;
- }
- void searchProjectsByProjectNameWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* projectName */, const int32_t /* limit */, const int32_t /* offset */) {
- return;
- }
- void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */) {
- return;
- }
- void searchProjectsByProjectDescWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
- return;
- }
- void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */) {
- return;
- }
- void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */, const int32_t /* limit */, const int32_t /* offset */) {
- return;
- }
- void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */) {
+ void getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* projectName */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */) {
+ void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::status::ExperimentState::type /* experimentState */) {
+ void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::status::ExperimentState::type /* experimentState */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */) {
+ void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::status::ExperimentState::type /* experimentState */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
void searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & /* filters */, const int32_t /* limit */, const int32_t /* offset */) {
@@ -1985,16 +1791,10 @@ class AiravataNull : virtual public AiravataIf {
void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const int64_t /* fromTime */, const int64_t /* toTime */) {
return;
}
- void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* projectId */) {
- return;
- }
- void getAllExperimentsInProjectWithPagination(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 */) {
- return;
- }
- void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */) {
+ void 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 */) {
return;
}
- void getAllUserExperimentsWithPagination(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 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 */) {
return;
}
void createExperiment(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const ::apache::airavata::model::experiment::ExperimentModel& /* experiment */) {
@@ -4411,88 +4211,108 @@ class Airavata_deleteProject_presult {
};
-class Airavata_getAllUserProjects_args {
+class Airavata_getUserProjects_args {
public:
- static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
- static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+ static const char* ascii_fingerprint; // = "B0F1ED866602D6465A1E8B7B65B9DBBA";
+ static const uint8_t binary_fingerprint[16]; // = {0xB0,0xF1,0xED,0x86,0x66,0x02,0xD6,0x46,0x5A,0x1E,0x8B,0x7B,0x65,0xB9,0xDB,0xBA};
- Airavata_getAllUserProjects_args(const Airavata_getAllUserProjects_args&);
- Airavata_getAllUserProjects_args& operator=(const Airavata_getAllUserProjects_args&);
- Airavata_getAllUserProjects_args() : gatewayId(), userName() {
+ Airavata_getUserProjects_args(const Airavata_getUserProjects_args&);
+ Airavata_getUserProjects_args& operator=(const Airavata_getUserProjects_args&);
+ Airavata_getUserProjects_args() : gatewayId(), userName(), limit(0), offset(0) {
}
- virtual ~Airavata_getAllUserProjects_args() throw();
+ virtual ~Airavata_getUserProjects_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
+ int32_t limit;
+ int32_t offset;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_gatewayId(const std::string& val);
void __set_userName(const std::string& val);
- bool operator == (const Airavata_getAllUserProjects_args & rhs) const
+ void __set_limit(const int32_t val);
+
+ void __set_offset(const int32_t val);
+
+ bool operator == (const Airavata_getUserProjects_args & rhs) const
{
+ if (!(authzToken == rhs.authzToken))
+ return false;
if (!(gatewayId == rhs.gatewayId))
return false;
if (!(userName == rhs.userName))
return false;
+ if (!(limit == rhs.limit))
+ return false;
+ if (!(offset == rhs.offset))
+ return false;
return true;
}
- bool operator != (const Airavata_getAllUserProjects_args &rhs) const {
+ bool operator != (const Airavata_getUserProjects_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllUserProjects_args & ) const;
+ bool operator < (const Airavata_getUserProjects_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjects_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getUserProjects_args& obj);
};
-class Airavata_getAllUserProjects_pargs {
+class Airavata_getUserProjects_pargs {
public:
- static const char* ascii_fingerprint; // = "07A9615F837F7D0A952B595DD3020972";
- static const uint8_t binary_fingerprint[16]; // = {0x07,0xA9,0x61,0x5F,0x83,0x7F,0x7D,0x0A,0x95,0x2B,0x59,0x5D,0xD3,0x02,0x09,0x72};
+ static const char* ascii_fingerprint; // = "B0F1ED866602D6465A1E8B7B65B9DBBA";
+ static const uint8_t binary_fingerprint[16]; // = {0xB0,0xF1,0xED,0x86,0x66,0x02,0xD6,0x46,0x5A,0x1E,0x8B,0x7B,0x65,0xB9,0xDB,0xBA};
- virtual ~Airavata_getAllUserProjects_pargs() throw();
+ virtual ~Airavata_getUserProjects_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
+ const int32_t* limit;
+ const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjects_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getUserProjects_pargs& obj);
};
-typedef struct _Airavata_getAllUserProjects_result__isset {
- _Airavata_getAllUserProjects_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_getUserProjects_result__isset {
+ _Airavata_getUserProjects_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_getAllUserProjects_result__isset;
+ bool ae :1;
+} _Airavata_getUserProjects_result__isset;
-class Airavata_getAllUserProjects_result {
+class Airavata_getUserProjects_result {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
+ static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- Airavata_getAllUserProjects_result(const Airavata_getAllUserProjects_result&);
- Airavata_getAllUserProjects_result& operator=(const Airavata_getAllUserProjects_result&);
- Airavata_getAllUserProjects_result() {
+ Airavata_getUserProjects_result(const Airavata_getUserProjects_result&);
+ Airavata_getUserProjects_result& operator=(const Airavata_getUserProjects_result&);
+ Airavata_getUserProjects_result() {
}
- virtual ~Airavata_getAllUserProjects_result() throw();
+ virtual ~Airavata_getUserProjects_result() throw();
std::vector< ::apache::airavata::model::workspace::Project> 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_getAllUserProjects_result__isset __isset;
+ _Airavata_getUserProjects_result__isset __isset;
void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
@@ -4502,7 +4322,9 @@ class Airavata_getAllUserProjects_result {
void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
- bool operator == (const Airavata_getAllUserProjects_result & rhs) const
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_getUserProjects_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -4512,64 +4334,69 @@ class Airavata_getAllUserProjects_result {
return false;
if (!(ase == rhs.ase))
return false;
+ if (!(ae == rhs.ae))
+ return false;
return true;
}
- bool operator != (const Airavata_getAllUserProjects_result &rhs) const {
+ bool operator != (const Airavata_getUserProjects_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllUserProjects_result & ) const;
+ bool operator < (const Airavata_getUserProjects_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjects_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getUserProjects_result& obj);
};
-typedef struct _Airavata_getAllUserProjects_presult__isset {
- _Airavata_getAllUserProjects_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_getUserProjects_presult__isset {
+ _Airavata_getUserProjects_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_getAllUserProjects_presult__isset;
+ bool ae :1;
+} _Airavata_getUserProjects_presult__isset;
-class Airavata_getAllUserProjects_presult {
+class Airavata_getUserProjects_presult {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
+ static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- virtual ~Airavata_getAllUserProjects_presult() throw();
+ virtual ~Airavata_getUserProjects_presult() throw();
std::vector< ::apache::airavata::model::workspace::Project> * 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_getAllUserProjects_presult__isset __isset;
+ _Airavata_getUserProjects_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjects_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getUserProjects_presult& obj);
};
-class Airavata_getAllUserProjectsWithPagination_args {
+class Airavata_searchProjectsByProjectName_args {
public:
- static const char* ascii_fingerprint; // = "B0F1ED866602D6465A1E8B7B65B9DBBA";
- static const uint8_t binary_fingerprint[16]; // = {0xB0,0xF1,0xED,0x86,0x66,0x02,0xD6,0x46,0x5A,0x1E,0x8B,0x7B,0x65,0xB9,0xDB,0xBA};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- Airavata_getAllUserProjectsWithPagination_args(const Airavata_getAllUserProjectsWithPagination_args&);
- Airavata_getAllUserProjectsWithPagination_args& operator=(const Airavata_getAllUserProjectsWithPagination_args&);
- Airavata_getAllUserProjectsWithPagination_args() : gatewayId(), userName(), limit(0), offset(0) {
+ Airavata_searchProjectsByProjectName_args(const Airavata_searchProjectsByProjectName_args&);
+ Airavata_searchProjectsByProjectName_args& operator=(const Airavata_searchProjectsByProjectName_args&);
+ Airavata_searchProjectsByProjectName_args() : gatewayId(), userName(), projectName(), limit(0), offset(0) {
}
- virtual ~Airavata_getAllUserProjectsWithPagination_args() throw();
+ virtual ~Airavata_searchProjectsByProjectName_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
+ std::string projectName;
int32_t limit;
int32_t offset;
@@ -4579,11 +4406,13 @@ class Airavata_getAllUserProjectsWithPagination_args {
void __set_userName(const std::string& val);
+ void __set_projectName(const std::string& val);
+
void __set_limit(const int32_t val);
void __set_offset(const int32_t val);
- bool operator == (const Airavata_getAllUserProjectsWithPagination_args & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectName_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -4591,72 +4420,75 @@ class Airavata_getAllUserProjectsWithPagination_args {
return false;
if (!(userName == rhs.userName))
return false;
+ if (!(projectName == rhs.projectName))
+ return false;
if (!(limit == rhs.limit))
return false;
if (!(offset == rhs.offset))
return false;
return true;
}
- bool operator != (const Airavata_getAllUserProjectsWithPagination_args &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectName_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllUserProjectsWithPagination_args & ) const;
+ bool operator < (const Airavata_searchProjectsByProjectName_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjectsWithPagination_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_args& obj);
};
-class Airavata_getAllUserProjectsWithPagination_pargs {
+class Airavata_searchProjectsByProjectName_pargs {
public:
- static const char* ascii_fingerprint; // = "B0F1ED866602D6465A1E8B7B65B9DBBA";
- static const uint8_t binary_fingerprint[16]; // = {0xB0,0xF1,0xED,0x86,0x66,0x02,0xD6,0x46,0x5A,0x1E,0x8B,0x7B,0x65,0xB9,0xDB,0xBA};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- virtual ~Airavata_getAllUserProjectsWithPagination_pargs() throw();
+ virtual ~Airavata_searchProjectsByProjectName_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
+ const std::string* projectName;
const int32_t* limit;
const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjectsWithPagination_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_pargs& obj);
};
-typedef struct _Airavata_getAllUserProjectsWithPagination_result__isset {
- _Airavata_getAllUserProjectsWithPagination_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchProjectsByProjectName_result__isset {
+ _Airavata_searchProjectsByProjectName_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_getAllUserProjectsWithPagination_result__isset;
+} _Airavata_searchProjectsByProjectName_result__isset;
-class Airavata_getAllUserProjectsWithPagination_result {
+class Airavata_searchProjectsByProjectName_result {
public:
static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- Airavata_getAllUserProjectsWithPagination_result(const Airavata_getAllUserProjectsWithPagination_result&);
- Airavata_getAllUserProjectsWithPagination_result& operator=(const Airavata_getAllUserProjectsWithPagination_result&);
- Airavata_getAllUserProjectsWithPagination_result() {
+ Airavata_searchProjectsByProjectName_result(const Airavata_searchProjectsByProjectName_result&);
+ Airavata_searchProjectsByProjectName_result& operator=(const Airavata_searchProjectsByProjectName_result&);
+ Airavata_searchProjectsByProjectName_result() {
}
- virtual ~Airavata_getAllUserProjectsWithPagination_result() throw();
+ virtual ~Airavata_searchProjectsByProjectName_result() throw();
std::vector< ::apache::airavata::model::workspace::Project> 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_getAllUserProjectsWithPagination_result__isset __isset;
+ _Airavata_searchProjectsByProjectName_result__isset __isset;
void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
@@ -4668,7 +4500,7 @@ class Airavata_getAllUserProjectsWithPagination_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_getAllUserProjectsWithPagination_result & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectName_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -4682,137 +4514,157 @@ class Airavata_getAllUserProjectsWithPagination_result {
return false;
return true;
}
- bool operator != (const Airavata_getAllUserProjectsWithPagination_result &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectName_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllUserProjectsWithPagination_result & ) const;
+ bool operator < (const Airavata_searchProjectsByProjectName_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjectsWithPagination_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_result& obj);
};
-typedef struct _Airavata_getAllUserProjectsWithPagination_presult__isset {
- _Airavata_getAllUserProjectsWithPagination_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchProjectsByProjectName_presult__isset {
+ _Airavata_searchProjectsByProjectName_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_getAllUserProjectsWithPagination_presult__isset;
+} _Airavata_searchProjectsByProjectName_presult__isset;
-class Airavata_getAllUserProjectsWithPagination_presult {
+class Airavata_searchProjectsByProjectName_presult {
public:
static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- virtual ~Airavata_getAllUserProjectsWithPagination_presult() throw();
+ virtual ~Airavata_searchProjectsByProjectName_presult() throw();
std::vector< ::apache::airavata::model::workspace::Project> * 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_getAllUserProjectsWithPagination_presult__isset __isset;
+ _Airavata_searchProjectsByProjectName_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllUserProjectsWithPagination_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_presult& obj);
};
-class Airavata_searchProjectsByProjectName_args {
+class Airavata_searchProjectsByProjectDesc_args {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- Airavata_searchProjectsByProjectName_args(const Airavata_searchProjectsByProjectName_args&);
- Airavata_searchProjectsByProjectName_args& operator=(const Airavata_searchProjectsByProjectName_args&);
- Airavata_searchProjectsByProjectName_args() : gatewayId(), userName(), projectName() {
+ Airavata_searchProjectsByProjectDesc_args(const Airavata_searchProjectsByProjectDesc_args&);
+ Airavata_searchProjectsByProjectDesc_args& operator=(const Airavata_searchProjectsByProjectDesc_args&);
+ Airavata_searchProjectsByProjectDesc_args() : gatewayId(), userName(), description(), limit(0), offset(0) {
}
- virtual ~Airavata_searchProjectsByProjectName_args() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- std::string projectName;
+ std::string description;
+ int32_t limit;
+ int32_t offset;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_gatewayId(const std::string& val);
void __set_userName(const std::string& val);
- void __set_projectName(const std::string& val);
+ void __set_description(const std::string& val);
- bool operator == (const Airavata_searchProjectsByProjectName_args & rhs) const
- {
- if (!(gatewayId == rhs.gatewayId))
- return false;
- if (!(userName == rhs.userName))
+ void __set_limit(const int32_t val);
+
+ void __set_offset(const int32_t val);
+
+ bool operator == (const Airavata_searchProjectsByProjectDesc_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
return false;
- if (!(projectName == rhs.projectName))
+ if (!(gatewayId == rhs.gatewayId))
+ return false;
+ if (!(userName == rhs.userName))
+ return false;
+ if (!(description == rhs.description))
+ return false;
+ if (!(limit == rhs.limit))
+ return false;
+ if (!(offset == rhs.offset))
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectName_args &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectDesc_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectName_args & ) const;
+ bool operator < (const Airavata_searchProjectsByProjectDesc_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_args& obj);
};
-class Airavata_searchProjectsByProjectName_pargs {
+class Airavata_searchProjectsByProjectDesc_pargs {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- virtual ~Airavata_searchProjectsByProjectName_pargs() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const std::string* projectName;
+ const std::string* description;
+ const int32_t* limit;
+ const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_pargs& obj);
};
-typedef struct _Airavata_searchProjectsByProjectName_result__isset {
- _Airavata_searchProjectsByProjectName_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_searchProjectsByProjectDesc_result__isset {
+ _Airavata_searchProjectsByProjectDesc_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_searchProjectsByProjectName_result__isset;
+ bool ae :1;
+} _Airavata_searchProjectsByProjectDesc_result__isset;
-class Airavata_searchProjectsByProjectName_result {
+class Airavata_searchProjectsByProjectDesc_result {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
+ static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- Airavata_searchProjectsByProjectName_result(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result& operator=(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result() {
+ Airavata_searchProjectsByProjectDesc_result(const Airavata_searchProjectsByProjectDesc_result&);
+ Airavata_searchProjectsByProjectDesc_result& operator=(const Airavata_searchProjectsByProjectDesc_result&);
+ Airavata_searchProjectsByProjectDesc_result() {
}
- virtual ~Airavata_searchProjectsByProjectName_result() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_result() throw();
std::vector< ::apache::airavata::model::workspace::Project> 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_searchProjectsByProjectName_result__isset __isset;
+ _Airavata_searchProjectsByProjectDesc_result__isset __isset;
void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
@@ -4822,7 +4674,9 @@ class Airavata_searchProjectsByProjectName_result {
void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
- bool operator == (const Airavata_searchProjectsByProjectName_result & rhs) const
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_searchProjectsByProjectDesc_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -4832,65 +4686,69 @@ class Airavata_searchProjectsByProjectName_result {
return false;
if (!(ase == rhs.ase))
return false;
+ if (!(ae == rhs.ae))
+ return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectName_result &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectDesc_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectName_result & ) const;
+ bool operator < (const Airavata_searchProjectsByProjectDesc_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_result& obj);
};
-typedef struct _Airavata_searchProjectsByProjectName_presult__isset {
- _Airavata_searchProjectsByProjectName_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_searchProjectsByProjectDesc_presult__isset {
+ _Airavata_searchProjectsByProjectDesc_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_searchProjectsByProjectName_presult__isset;
+ bool ae :1;
+} _Airavata_searchProjectsByProjectDesc_presult__isset;
-class Airavata_searchProjectsByProjectName_presult {
+class Airavata_searchProjectsByProjectDesc_presult {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
+ static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
- virtual ~Airavata_searchProjectsByProjectName_presult() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_presult() throw();
std::vector< ::apache::airavata::model::workspace::Project> * 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_searchProjectsByProjectName_presult__isset __isset;
+ _Airavata_searchProjectsByProjectDesc_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectName_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_presult& obj);
};
-class Airavata_searchProjectsByProjectNameWithPagination_args {
+class Airavata_searchExperimentsByName_args {
public:
static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- Airavata_searchProjectsByProjectNameWithPagination_args(const Airavata_searchProjectsByProjectNameWithPagination_args&);
- Airavata_searchProjectsByProjectNameWithPagination_args& operator=(const Airavata_searchProjectsByProjectNameWithPagination_args&);
- Airavata_searchProjectsByProjectNameWithPagination_args() : gatewayId(), userName(), projectName(), limit(0), offset(0) {
+ Airavata_searchExperimentsByName_args(const Airavata_searchExperimentsByName_args&);
+ Airavata_searchExperimentsByName_args& operator=(const Airavata_searchExperimentsByName_args&);
+ Airavata_searchExperimentsByName_args() : gatewayId(), userName(), expName(), limit(0), offset(0) {
}
- virtual ~Airavata_searchProjectsByProjectNameWithPagination_args() throw();
+ virtual ~Airavata_searchExperimentsByName_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- std::string projectName;
+ std::string expName;
int32_t limit;
int32_t offset;
@@ -4900,13 +4758,13 @@ class Airavata_searchProjectsByProjectNameWithPagination_args {
void __set_userName(const std::string& val);
- void __set_projectName(const std::string& val);
+ void __set_expName(const std::string& val);
void __set_limit(const int32_t val);
void __set_offset(const int32_t val);
- bool operator == (const Airavata_searchProjectsByProjectNameWithPagination_args & rhs) const
+ bool operator == (const Airavata_searchExperimentsByName_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -4914,7 +4772,7 @@ class Airavata_searchProjectsByProjectNameWithPagination_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(projectName == rhs.projectName))
+ if (!(expName == rhs.expName))
return false;
if (!(limit == rhs.limit))
return false;
@@ -4922,69 +4780,69 @@ class Airavata_searchProjectsByProjectNameWithPagination_args {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectNameWithPagination_args &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByName_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectNameWithPagination_args & ) const;
+ bool operator < (const Airavata_searchExperimentsByName_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectNameWithPagination_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByName_args& obj);
};
-class Airavata_searchProjectsByProjectNameWithPagination_pargs {
+class Airavata_searchExperimentsByName_pargs {
public:
static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- virtual ~Airavata_searchProjectsByProjectNameWithPagination_pargs() throw();
+ virtual ~Airavata_searchExperimentsByName_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const std::string* projectName;
+ const std::string* expName;
const int32_t* limit;
const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectNameWithPagination_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByName_pargs& obj);
};
-typedef struct _Airavata_searchProjectsByProjectNameWithPagination_result__isset {
- _Airavata_searchProjectsByProjectNameWithPagination_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchExperimentsByName_result__isset {
+ _Airavata_searchExperimentsByName_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_searchProjectsByProjectNameWithPagination_result__isset;
+} _Airavata_searchExperimentsByName_result__isset;
-class Airavata_searchProjectsByProjectNameWithPagination_result {
+class Airavata_searchExperimentsByName_result {
public:
- static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
- static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- Airavata_searchProjectsByProjectNameWithPagination_result(const Airavata_searchProjectsByProjectNameWithPagination_result&);
- Airavata_searchProjectsByProjectNameWithPagination_result& operator=(const Airavata_searchProjectsByProjectNameWithPagination_result&);
- Airavata_searchProjectsByProjectNameWithPagination_result() {
+ Airavata_searchExperimentsByName_result(const Airavata_searchExperimentsByName_result&);
+ Airavata_searchExperimentsByName_result& operator=(const Airavata_searchExperimentsByName_result&);
+ Airavata_searchExperimentsByName_result() {
}
- virtual ~Airavata_searchProjectsByProjectNameWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::Project> success;
+ virtual ~Airavata_searchExperimentsByName_result() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> 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_searchProjectsByProjectNameWithPagination_result__isset __isset;
+ _Airavata_searchExperimentsByName_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -4994,7 +4852,7 @@ class Airavata_searchProjectsByProjectNameWithPagination_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchProjectsByProjectNameWithPagination_result & rhs) const
+ bool operator == (const Airavata_searchExperimentsByName_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -5008,64 +4866,69 @@ class Airavata_searchProjectsByProjectNameWithPagination_result {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectNameWithPagination_result &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByName_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectNameWithPagination_result & ) const;
+ bool operator < (const Airavata_searchExperimentsByName_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectNameWithPagination_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByName_result& obj);
};
-typedef struct _Airavata_searchProjectsByProjectNameWithPagination_presult__isset {
- _Airavata_searchProjectsByProjectNameWithPagination_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchExperimentsByName_presult__isset {
+ _Airavata_searchExperimentsByName_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_searchProjectsByProjectNameWithPagination_presult__isset;
+} _Airavata_searchExperimentsByName_presult__isset;
-class Airavata_searchProjectsByProjectNameWithPagination_presult {
+class Airavata_searchExperimentsByName_presult {
public:
- static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
- static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- virtual ~Airavata_searchProjectsByProjectNameWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::Project> * success;
+ virtual ~Airavata_searchExperimentsByName_presult() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * 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_searchProjectsByProjectNameWithPagination_presult__isset __isset;
+ _Airavata_searchExperimentsByName_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectNameWithPagination_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByName_presult& obj);
};
-class Airavata_searchProjectsByProjectDesc_args {
+class Airavata_searchExperimentsByDesc_args {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- Airavata_searchProjectsByProjectDesc_args(const Airavata_searchProjectsByProjectDesc_args&);
- Airavata_searchProjectsByProjectDesc_args& operator=(const Airavata_searchProjectsByProjectDesc_args&);
- Airavata_searchProjectsByProjectDesc_args() : gatewayId(), userName(), description() {
+ Airavata_searchExperimentsByDesc_args(const Airavata_searchExperimentsByDesc_args&);
+ Airavata_searchExperimentsByDesc_args& operator=(const Airavata_searchExperimentsByDesc_args&);
+ Airavata_searchExperimentsByDesc_args() : gatewayId(), userName(), description(), limit(0), offset(0) {
}
- virtual ~Airavata_searchProjectsByProjectDesc_args() throw();
+ virtual ~Airavata_searchExperimentsByDesc_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
std::string description;
+ int32_t limit;
+ int32_t offset;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_gatewayId(const std::string& val);
@@ -5073,74 +4936,89 @@ class Airavata_searchProjectsByProjectDesc_args {
void __set_description(const std::string& val);
- bool operator == (const Airavata_searchProjectsByProjectDesc_args & rhs) const
+ void __set_limit(const int32_t val);
+
+ void __set_offset(const int32_t val);
+
+ bool operator == (const Airavata_searchExperimentsByDesc_args & rhs) const
{
+ if (!(authzToken == rhs.authzToken))
+ return false;
if (!(gatewayId == rhs.gatewayId))
return false;
if (!(userName == rhs.userName))
return false;
if (!(description == rhs.description))
return false;
+ if (!(limit == rhs.limit))
+ return false;
+ if (!(offset == rhs.offset))
+ return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDesc_args &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByDesc_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDesc_args & ) const;
+ bool operator < (const Airavata_searchExperimentsByDesc_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByDesc_args& obj);
};
-class Airavata_searchProjectsByProjectDesc_pargs {
+class Airavata_searchExperimentsByDesc_pargs {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- virtual ~Airavata_searchProjectsByProjectDesc_pargs() throw();
+ virtual ~Airavata_searchExperimentsByDesc_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
const std::string* description;
+ const int32_t* limit;
+ const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByDesc_pargs& obj);
};
-typedef struct _Airavata_searchProjectsByProjectDesc_result__isset {
- _Airavata_searchProjectsByProjectDesc_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_searchExperimentsByDesc_result__isset {
+ _Airavata_searchExperimentsByDesc_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_searchProjectsByProjectDesc_result__isset;
+ bool ae :1;
+} _Airavata_searchExperimentsByDesc_result__isset;
-class Airavata_searchProjectsByProjectDesc_result {
+class Airavata_searchExperimentsByDesc_result {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- Airavata_searchProjectsByProjectDesc_result(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result& operator=(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result() {
+ Airavata_searchExperimentsByDesc_result(const Airavata_searchExperimentsByDesc_result&);
+ Airavata_searchExperimentsByDesc_result& operator=(const Airavata_searchExperimentsByDesc_result&);
+ Airavata_searchExperimentsByDesc_result() {
}
- virtual ~Airavata_searchProjectsByProjectDesc_result() throw();
- std::vector< ::apache::airavata::model::workspace::Project> success;
+ virtual ~Airavata_searchExperimentsByDesc_result() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> 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_searchProjectsByProjectDesc_result__isset __isset;
+ _Airavata_searchExperimentsByDesc_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5148,7 +5026,9 @@ class Airavata_searchProjectsByProjectDesc_result {
void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
- bool operator == (const Airavata_searchProjectsByProjectDesc_result & rhs) const
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_searchExperimentsByDesc_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -5158,65 +5038,69 @@ class Airavata_searchProjectsByProjectDesc_result {
return false;
if (!(ase == rhs.ase))
return false;
+ if (!(ae == rhs.ae))
+ return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDesc_result &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByDesc_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDesc_result & ) const;
+ bool operator < (const Airavata_searchExperimentsByDesc_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByDesc_result& obj);
};
-typedef struct _Airavata_searchProjectsByProjectDesc_presult__isset {
- _Airavata_searchProjectsByProjectDesc_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+typedef struct _Airavata_searchExperimentsByDesc_presult__isset {
+ _Airavata_searchExperimentsByDesc_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
-} _Airavata_searchProjectsByProjectDesc_presult__isset;
+ bool ae :1;
+} _Airavata_searchExperimentsByDesc_presult__isset;
-class Airavata_searchProjectsByProjectDesc_presult {
+class Airavata_searchExperimentsByDesc_presult {
public:
- static const char* ascii_fingerprint; // = "DE4B6CD097BA21C87B066F507A85DD2B";
- static const uint8_t binary_fingerprint[16]; // = {0xDE,0x4B,0x6C,0xD0,0x97,0xBA,0x21,0xC8,0x7B,0x06,0x6F,0x50,0x7A,0x85,0xDD,0x2B};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- virtual ~Airavata_searchProjectsByProjectDesc_presult() throw();
- std::vector< ::apache::airavata::model::workspace::Project> * success;
+ virtual ~Airavata_searchExperimentsByDesc_presult() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * 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_searchProjectsByProjectDesc_presult__isset __isset;
+ _Airavata_searchExperimentsByDesc_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDesc_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByDesc_presult& obj);
};
-class Airavata_searchProjectsByProjectDescWithPagination_args {
+class Airavata_searchExperimentsByApplication_args {
public:
static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- Airavata_searchProjectsByProjectDescWithPagination_args(const Airavata_searchProjectsByProjectDescWithPagination_args&);
- Airavata_searchProjectsByProjectDescWithPagination_args& operator=(const Airavata_searchProjectsByProjectDescWithPagination_args&);
- Airavata_searchProjectsByProjectDescWithPagination_args() : gatewayId(), userName(), description(), limit(0), offset(0) {
+ Airavata_searchExperimentsByApplication_args(const Airavata_searchExperimentsByApplication_args&);
+ Airavata_searchExperimentsByApplication_args& operator=(const Airavata_searchExperimentsByApplication_args&);
+ Airavata_searchExperimentsByApplication_args() : gatewayId(), userName(), applicationId(), limit(0), offset(0) {
}
- virtual ~Airavata_searchProjectsByProjectDescWithPagination_args() throw();
+ virtual ~Airavata_searchExperimentsByApplication_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- std::string description;
+ std::string applicationId;
int32_t limit;
int32_t offset;
@@ -5226,13 +5110,13 @@ class Airavata_searchProjectsByProjectDescWithPagination_args {
void __set_userName(const std::string& val);
- void __set_description(const std::string& val);
+ void __set_applicationId(const std::string& val);
void __set_limit(const int32_t val);
void __set_offset(const int32_t val);
- bool operator == (const Airavata_searchProjectsByProjectDescWithPagination_args & rhs) const
+ bool operator == (const Airavata_searchExperimentsByApplication_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -5240,7 +5124,7 @@ class Airavata_searchProjectsByProjectDescWithPagination_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(description == rhs.description))
+ if (!(applicationId == rhs.applicationId))
return false;
if (!(limit == rhs.limit))
return false;
@@ -5248,69 +5132,69 @@ class Airavata_searchProjectsByProjectDescWithPagination_args {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDescWithPagination_args &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByApplication_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDescWithPagination_args & ) const;
+ bool operator < (const Airavata_searchExperimentsByApplication_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDescWithPagination_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByApplication_args& obj);
};
-class Airavata_searchProjectsByProjectDescWithPagination_pargs {
+class Airavata_searchExperimentsByApplication_pargs {
public:
static const char* ascii_fingerprint; // = "97BE39385D449F49A0D934F09B2EF404";
static const uint8_t binary_fingerprint[16]; // = {0x97,0xBE,0x39,0x38,0x5D,0x44,0x9F,0x49,0xA0,0xD9,0x34,0xF0,0x9B,0x2E,0xF4,0x04};
- virtual ~Airavata_searchProjectsByProjectDescWithPagination_pargs() throw();
+ virtual ~Airavata_searchExperimentsByApplication_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const std::string* description;
+ const std::string* applicationId;
const int32_t* limit;
const int32_t* offset;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDescWithPagination_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByApplication_pargs& obj);
};
-typedef struct _Airavata_searchProjectsByProjectDescWithPagination_result__isset {
- _Airavata_searchProjectsByProjectDescWithPagination_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchExperimentsByApplication_result__isset {
+ _Airavata_searchExperimentsByApplication_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_searchProjectsByProjectDescWithPagination_result__isset;
+} _Airavata_searchExperimentsByApplication_result__isset;
-class Airavata_searchProjectsByProjectDescWithPagination_result {
+class Airavata_searchExperimentsByApplication_result {
public:
- static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
- static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- Airavata_searchProjectsByProjectDescWithPagination_result(const Airavata_searchProjectsByProjectDescWithPagination_result&);
- Airavata_searchProjectsByProjectDescWithPagination_result& operator=(const Airavata_searchProjectsByProjectDescWithPagination_result&);
- Airavata_searchProjectsByProjectDescWithPagination_result() {
+ Airavata_searchExperimentsByApplication_result(const Airavata_searchExperimentsByApplication_result&);
+ Airavata_searchExperimentsByApplication_result& operator=(const Airavata_searchExperimentsByApplication_result&);
+ Airavata_searchExperimentsByApplication_result() {
}
- virtual ~Airavata_searchProjectsByProjectDescWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::Project> success;
+ virtual ~Airavata_searchExperimentsByApplication_result() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> 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_searchProjectsByProjectDescWithPagination_result__isset __isset;
+ _Airavata_searchExperimentsByApplication_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5320,7 +5204,7 @@ class Airavata_searchProjectsByProjectDescWithPagination_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchProjectsByProjectDescWithPagination_result & rhs) const
+ bool operator == (const Airavata_searchExperimentsByApplication_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -5334,137 +5218,157 @@ class Airavata_searchProjectsByProjectDescWithPagination_result {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDescWithPagination_result &rhs) const {
+ bool operator != (const Airavata_searchExperimentsByApplication_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDescWithPagination_result & ) const;
+ bool operator < (const Airavata_searchExperimentsByApplication_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDescWithPagination_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByApplication_result& obj);
};
-typedef struct _Airavata_searchProjectsByProjectDescWithPagination_presult__isset {
- _Airavata_searchProjectsByProjectDescWithPagination_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchExperimentsByApplication_presult__isset {
+ _Airavata_searchExperimentsByApplication_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_searchProjectsByProjectDescWithPagination_presult__isset;
+} _Airavata_searchExperimentsByApplication_presult__isset;
-class Airavata_searchProjectsByProjectDescWithPagination_presult {
+class Airavata_searchExperimentsByApplication_presult {
public:
- static const char* ascii_fingerprint; // = "9FDEFB6B8A9E4977A43B7C4722664EC3";
- static const uint8_t binary_fingerprint[16]; // = {0x9F,0xDE,0xFB,0x6B,0x8A,0x9E,0x49,0x77,0xA4,0x3B,0x7C,0x47,0x22,0x66,0x4E,0xC3};
+ static const char* ascii_fingerprint; // = "6490BEC830E2A72869B2F4E224CB0E50";
+ static const uint8_t binary_fingerprint[16]; // = {0x64,0x90,0xBE,0xC8,0x30,0xE2,0xA7,0x28,0x69,0xB2,0xF4,0xE2,0x24,0xCB,0x0E,0x50};
- virtual ~Airavata_searchProjectsByProjectDescWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::Project> * success;
+ virtual ~Airavata_searchExperimentsByApplication_presult() throw();
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * 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_searchProjectsByProjectDescWithPagination_presult__isset __isset;
+ _Airavata_searchExperimentsByApplication_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_searchProjectsByProjectDescWithPagination_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_searchExperimentsByApplication_presult& obj);
};
-class Airavata_searchExperimentsByName_args {
+class Airavata_searchExperimentsByStatus_args {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "A902C1FCF3C2BF735A7E5A4A6FF9AE3D";
+ static const uint8_t binary_fingerprint[16]; // = {0xA9,0x02,0xC1,0xFC,0xF3,0xC2,0xBF,0x73,0x5A,0x7E,0x5A,0x4A,0x6F,0xF9,0xAE,0x3D};
- Airavata_searchExperimentsByName_args(const Airavata_searchExperimentsByName_args&);
- Airavata_searchExperimentsByName_args& operator=(const Airavata_searchExperimentsByName_args&);
- Airavata_searchExperimentsByName_args() : gatewayId(), userName(), expName() {
+ Airavata_searchExperimentsByStatus_args(const Airavata_searchExperimentsByStatus_args&);
+ Airavata_searchExperimentsByStatus_args& operator=(const Airavata_searchExperimentsByStatus_args&);
+ Airavata_searchExperimentsByStatus_args() : gatewayId(), userName(), experimentState(( ::apache::airavata::model::status::ExperimentState::type)0), limit(0), offset(0) {
}
- virtual ~Airavata_searchExperimentsByName_args() throw();
+ virtual ~Airavata_searchExperimen
<TRUNCATED>
[11/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
removing non paginated versions of API methods for project and experiment retrieval, from Airavata API
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dc61c676
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dc61c676
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dc61c676
Branch: refs/heads/master
Commit: dc61c676067c8a08b8ddccf314fda3e9435089c0
Parents: bd97f80
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Aug 3 02:00:06 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Aug 3 02:00:10 2015 +0530
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 206 +-
.../java/org/apache/airavata/api/Airavata.java | 27024 ++++-------------
.../airavata/api/airavata_apiConstants.java | 2 +-
.../main/resources/lib/airavata/Airavata.cpp | 7956 ++---
.../src/main/resources/lib/airavata/Airavata.h | 3388 +--
.../lib/airavata/Airavata_server.skeleton.cpp | 244 +-
.../lib/airavata/airavata_api_constants.cpp | 2 +-
.../resources/lib/Airavata/API/Airavata.php | 6349 +---
.../main/resources/lib/Airavata/API/Types.php | 2 +-
.../lib/apache/airavata/api/Airavata-remote | 136 +-
.../lib/apache/airavata/api/Airavata.py | 5120 +---
.../lib/apache/airavata/api/constants.py | 2 +-
.../client/samples/CreateLaunchBES.java | 14 +-
.../client/samples/CreateLaunchExperiment.java | 14 +-
.../org/apache/airavata/model/Workflow.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/DataMovementInterface.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/GridFTPDataMovement.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreDataMovement.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.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 +-
.../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 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../airavata-api/airavata_api.thrift | 199 +-
84 files changed, 11247 insertions(+), 39549 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 56af290..50097a1 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
@@ -357,21 +357,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
- /**
- * Get all Project by user
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @deprecated Instead use getAllUserProjectsWithPagination method
- */
- @Deprecated
- @Override
- public List<Project> getAllUserProjects(String gatewayId, String userName) throws InvalidRequestException,
- AiravataClientException, AiravataSystemException, TException {
- return getAllUserProjectsWithPagination(new AuthzToken(""), gatewayId, userName, -1, -1);
- }
/**
* Get all Project by user with pagination. Results will be ordered based
@@ -388,7 +373,7 @@ public class AiravataServerHandler implements Airavata.Iface {
**/
@Override
@SecurityCheck
- public List<Project> getAllUserProjectsWithPagination(AuthzToken authzToken, String gatewayId, String userName,
+ public List<Project> getUserProjects(AuthzToken authzToken, String gatewayId, String userName,
int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
@@ -433,24 +418,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- */
- @Deprecated
- @Override
- public List<Project> searchProjectsByProjectName(String gatewayId, String userName, String projectName)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchProjectsByProjectNameWithPagination(new AuthzToken(""), gatewayId, userName, projectName, -1, -1);
- }
-
- /**
* Get all Project for user by project name with pagination. Results will be ordered based
* on creation time DESC
*
@@ -467,7 +434,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<Project> searchProjectsByProjectNameWithPagination(AuthzToken authzToken, String gatewayId, String userName,
+ public List<Project> searchProjectsByProjectName(AuthzToken authzToken, String gatewayId, String userName,
String projectName, int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
@@ -511,25 +478,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- */
- @Deprecated
- @Override
- public List<Project> searchProjectsByProjectDesc(String gatewayId, String userName, String description) throws InvalidRequestException,
- AiravataClientException,
- AiravataSystemException,
- TException {
- return searchProjectsByProjectDescWithPagination(new AuthzToken(""), gatewayId, userName, description, -1, -1);
- }
-
- /**
* Search and get all Projects for user by project description with pagination. Results
* will be ordered based on creation time DESC
*
@@ -546,7 +494,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<Project> searchProjectsByProjectDescWithPagination(AuthzToken authzToken, String gatewayId, String userName,
+ public List<Project> searchProjectsByProjectDesc(AuthzToken authzToken, String gatewayId, String userName,
String description, int limit, int offset) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
@@ -590,26 +538,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- */
- @Deprecated
- @Override
- public List<ExperimentSummaryModel> searchExperimentsByName(String gatewayId, String userName, String expName)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchExperimentsByNameWithPagination(new AuthzToken(""), gatewayId, userName, expName, -1, -1);
- }
-
- /**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
*
@@ -626,7 +554,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByNameWithPagination(AuthzToken authzToken, String gatewayId, String userName,
+ public List<ExperimentSummaryModel> searchExperimentsByName(AuthzToken authzToken, String gatewayId, String userName,
String expName, int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
@@ -670,25 +598,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- */
- @Deprecated
- @Override
- public List<ExperimentSummaryModel> searchExperimentsByDesc(String gatewayId, String userName, String description)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchExperimentsByDescWithPagination(new AuthzToken(""), gatewayId, userName, description, -1, -1);
- }
-
- /**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
*
@@ -705,7 +614,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByDescWithPagination(AuthzToken authzToken, String gatewayId, String userName,
+ public List<ExperimentSummaryModel> searchExperimentsByDesc(AuthzToken authzToken, String gatewayId, String userName,
String description, int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
@@ -749,25 +658,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplication
- */
- @Deprecated
- @Override
- public List<ExperimentSummaryModel> searchExperimentsByApplication(String gatewayId, String userName, String applicationId)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchExperimentsByApplicationWithPagination(new AuthzToken(""), gatewayId, userName, applicationId, -1, -1);
- }
-
- /**
* Search Experiments by application id with pagination. Results will be sorted
* based on creation time DESC
*
@@ -784,7 +674,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByApplicationWithPagination(AuthzToken authzToken, String gatewayId,
+ public List<ExperimentSummaryModel> searchExperimentsByApplication(AuthzToken authzToken, String gatewayId,
String userName, String applicationId,
int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
@@ -829,24 +719,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiment state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- */
- @Deprecated
- @Override
- public List<ExperimentSummaryModel> searchExperimentsByStatus(String gatewayId, String userName, ExperimentState experimentState) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchExperimentsByStatusWithPagination(new AuthzToken(""), gatewayId, userName, experimentState, -1, -1);
- }
-
- /**
* Search Experiments by experiment status with pagination. Results will be sorted
* based on creation time DESC
*
@@ -863,7 +735,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByStatusWithPagination(AuthzToken authzToken, String gatewayId,
+ public List<ExperimentSummaryModel> searchExperimentsByStatus(AuthzToken authzToken, String gatewayId,
String userName, ExperimentState experimentState,
int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
@@ -908,26 +780,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTime
- */
- @Deprecated
- @Override
- public List<ExperimentSummaryModel> searchExperimentsByCreationTime(String gatewayId, String userName, long fromTime, long toTime) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return searchExperimentsByCreationTimeWithPagination(new AuthzToken(""), gatewayId, userName, fromTime, toTime, -1, -1);
- }
-
- /**
* Search Experiments by experiment creation time with pagination. Results will be sorted
* based on creation time DESC
*
@@ -946,7 +798,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination(AuthzToken authzToken, String gatewayId,
+ public List<ExperimentSummaryModel> searchExperimentsByCreationTime(AuthzToken authzToken, String gatewayId,
String userName, long fromTime,
long toTime, int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
@@ -1105,25 +957,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- */
- @Deprecated
- @Override
- public List<ExperimentModel> getAllExperimentsInProject(String projectId) throws InvalidRequestException,
- AiravataClientException,
- AiravataSystemException,
- ProjectNotFoundException,
- TException {
- return getAllExperimentsInProjectWithPagination(new AuthzToken(""), projectId, -1, -1);
- }
-
- /**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -1135,7 +969,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentModel> getAllExperimentsInProjectWithPagination(AuthzToken authzToken, String projectId, int limit, int offset)
+ public List<ExperimentModel> getExperimentsInProject(AuthzToken authzToken, String projectId, int limit, int offset)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, ProjectNotFoundException,
AuthorizationException, TException {
if (!validateString(projectId)){
@@ -1173,23 +1007,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- */
- @Deprecated
- @Override
- public List<ExperimentModel> getAllUserExperiments(String gatewayId, String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- return getAllUserExperimentsWithPagination(new AuthzToken(""), gatewayId, userName, -1, -1);
- }
-
- /**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get Experiments by user pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -1203,7 +1021,7 @@ public class AiravataServerHandler implements Airavata.Iface {
*/
@Override
@SecurityCheck
- public List<ExperimentModel> getAllUserExperimentsWithPagination(AuthzToken authzToken, String gatewayId, String userName, int limit,
+ public List<ExperimentModel> getUserExperiments(AuthzToken authzToken, String gatewayId, String userName, int limit,
int offset) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
[05/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 fba2a7c..38e6e6a 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
@@ -188,25 +188,6 @@ interface AiravataIf {
*/
public function deleteProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId);
/**
- * * Get all Project by user
- * *
- * * @param gatewayId
- * * The identifier for the requested gateway.
- * *
- * * @param userName
- * * The Project Object described in the workspace_model
- * * @deprecated Instead use getAllUserProjectsWithPagination
- * *
- *
- * @param string $gatewayId
- * @param string $userName
- * @return \Airavata\Model\Workspace\Project[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function getAllUserProjects($gatewayId, $userName);
- /**
* * Get all Project by user with pagination. Results will be ordered based
* * on creation time DESC
* *
@@ -231,27 +212,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllUserProjectsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
- /**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param string $projectName
- * @return \Airavata\Model\Workspace\Project[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchProjectsByProjectName($gatewayId, $userName, $projectName);
+ public function getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
/**
* Get all Project for user by project name with pagination.Results will be ordered based
* on creation time DESC
@@ -279,26 +240,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchProjectsByProjectNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
- /**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param string $description
- * @return \Airavata\Model\Workspace\Project[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchProjectsByProjectDesc($gatewayId, $userName, $description);
+ public function searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
/**
* Search and get all Projects for user by project description with pagination. Results
* will be ordered based on creation time DESC
@@ -326,29 +268,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchProjectsByProjectDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param useNname
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- *
- * @param string $gatewayId
- * @param string $userName
- * @param string $expName
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchExperimentsByName($gatewayId, $userName, $expName);
+ public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
/**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
@@ -376,28 +296,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchExperimentsByNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset);
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param string $description
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchExperimentsByDesc($gatewayId, $userName, $description);
+ public function searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset);
/**
* Search Experiments by experiment name with pagination. Results will be sorted
* based on creation time DESC
@@ -425,28 +324,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchExperimentsByDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
- /**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplicationWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param string $applicationId
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchExperimentsByApplication($gatewayId, $userName, $applicationId);
+ public function searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
/**
* Search Experiments by application id with pagination. Results will be sorted
* based on creation time DESC
@@ -474,28 +352,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchExperimentsByApplicationWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
- /**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiement state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param int $experimentState
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchExperimentsByStatus($gatewayId, $userName, $experimentState);
+ public function searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
/**
* Search Experiments by experiment status with pagination. Results will be sorted
* based on creation time DESC
@@ -523,31 +380,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchExperimentsByStatusWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
- /**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTimeWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @param int $fromTime
- * @param int $toTime
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function searchExperimentsByCreationTime($gatewayId, $userName, $fromTime, $toTime);
+ public function searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
/**
* Search Experiments by experiment creation time with pagination. Results will be sorted
* based on creation time DESC
@@ -578,7 +411,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchExperimentsByCreationTimeWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
+ public function searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
/**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
* based on creation time DESC
@@ -629,23 +462,7 @@ interface AiravataIf {
*/
public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime);
/**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- *
- * @param string $projectId
- * @return \Airavata\Model\Experiment\ExperimentModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\ProjectNotFoundException
- */
- public function getAllExperimentsInProject($projectId);
- /**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -666,27 +483,9 @@ interface AiravataIf {
* @throws \Airavata\API\Error\ProjectNotFoundException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllExperimentsInProjectWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset);
+ public function getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset);
/**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- *
- * @param string $gatewayId
- * @param string $userName
- * @return \Airavata\Model\Experiment\ExperimentModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function getAllUserExperiments($gatewayId, $userName);
- /**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get experiments by user with pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -709,7 +508,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllUserExperimentsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
+ public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
/**
* Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
* but inferred from the authentication header. This experiment is just a persistent place holder. The client
@@ -3613,76 +3412,15 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteProject failed: unknown result");
}
- public function getAllUserProjects($gatewayId, $userName)
+ public function getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $this->send_getAllUserProjects($gatewayId, $userName);
- return $this->recv_getAllUserProjects();
+ $this->send_getUserProjects($authzToken, $gatewayId, $userName, $limit, $offset);
+ return $this->recv_getUserProjects();
}
- public function send_getAllUserProjects($gatewayId, $userName)
+ public function send_getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_getAllUserProjects_args();
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getAllUserProjects', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getAllUserProjects', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getAllUserProjects()
- {
- $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_getAllUserProjects_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_getAllUserProjects_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;
- }
- throw new \Exception("getAllUserProjects failed: unknown result");
- }
-
- public function getAllUserProjectsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
- {
- $this->send_getAllUserProjectsWithPagination($authzToken, $gatewayId, $userName, $limit, $offset);
- return $this->recv_getAllUserProjectsWithPagination();
- }
-
- public function send_getAllUserProjectsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_getAllUserProjectsWithPagination_args();
+ $args = new \Airavata\API\Airavata_getUserProjects_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
@@ -3691,21 +3429,21 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getAllUserProjectsWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getUserProjects', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getAllUserProjectsWithPagination', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getUserProjects', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getAllUserProjectsWithPagination()
+ public function recv_getUserProjects()
{
$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_getAllUserProjectsWithPagination_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getUserProjects_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -3719,7 +3457,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getAllUserProjectsWithPagination_result();
+ $result = new \Airavata\API\Airavata_getUserProjects_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -3738,21 +3476,24 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getAllUserProjectsWithPagination failed: unknown result");
+ throw new \Exception("getUserProjects failed: unknown result");
}
- public function searchProjectsByProjectName($gatewayId, $userName, $projectName)
+ public function searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
{
- $this->send_searchProjectsByProjectName($gatewayId, $userName, $projectName);
+ $this->send_searchProjectsByProjectName($authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
return $this->recv_searchProjectsByProjectName();
}
- public function send_searchProjectsByProjectName($gatewayId, $userName, $projectName)
+ public function send_searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
{
$args = new \Airavata\API\Airavata_searchProjectsByProjectName_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$args->projectName = $projectName;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -3800,89 +3541,27 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchProjectsByProjectName failed: unknown result");
- }
-
- public function searchProjectsByProjectNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
- {
- $this->send_searchProjectsByProjectNameWithPagination($authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
- return $this->recv_searchProjectsByProjectNameWithPagination();
- }
-
- public function send_searchProjectsByProjectNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_searchProjectsByProjectNameWithPagination_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->projectName = $projectName;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'searchProjectsByProjectNameWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchProjectsByProjectNameWithPagination', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchProjectsByProjectNameWithPagination()
- {
- $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_searchProjectsByProjectNameWithPagination_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_searchProjectsByProjectNameWithPagination_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("searchProjectsByProjectNameWithPagination failed: unknown result");
+ throw new \Exception("searchProjectsByProjectName failed: unknown result");
}
- public function searchProjectsByProjectDesc($gatewayId, $userName, $description)
+ public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
{
- $this->send_searchProjectsByProjectDesc($gatewayId, $userName, $description);
+ $this->send_searchProjectsByProjectDesc($authzToken, $gatewayId, $userName, $description, $limit, $offset);
return $this->recv_searchProjectsByProjectDesc();
}
- public function send_searchProjectsByProjectDesc($gatewayId, $userName, $description)
+ public function send_searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
{
$args = new \Airavata\API\Airavata_searchProjectsByProjectDesc_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$args->description = $description;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -3930,89 +3609,27 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchProjectsByProjectDesc failed: unknown result");
- }
-
- public function searchProjectsByProjectDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
- {
- $this->send_searchProjectsByProjectDescWithPagination($authzToken, $gatewayId, $userName, $description, $limit, $offset);
- return $this->recv_searchProjectsByProjectDescWithPagination();
- }
-
- public function send_searchProjectsByProjectDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_searchProjectsByProjectDescWithPagination_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->description = $description;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'searchProjectsByProjectDescWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchProjectsByProjectDescWithPagination', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchProjectsByProjectDescWithPagination()
- {
- $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_searchProjectsByProjectDescWithPagination_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_searchProjectsByProjectDescWithPagination_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("searchProjectsByProjectDescWithPagination failed: unknown result");
+ throw new \Exception("searchProjectsByProjectDesc failed: unknown result");
}
- public function searchExperimentsByName($gatewayId, $userName, $expName)
+ public function searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
{
- $this->send_searchExperimentsByName($gatewayId, $userName, $expName);
+ $this->send_searchExperimentsByName($authzToken, $gatewayId, $userName, $expName, $limit, $offset);
return $this->recv_searchExperimentsByName();
}
- public function send_searchExperimentsByName($gatewayId, $userName, $expName)
+ public function send_searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
{
$args = new \Airavata\API\Airavata_searchExperimentsByName_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$args->expName = $expName;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -4060,89 +3677,27 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchExperimentsByName failed: unknown result");
- }
-
- public function searchExperimentsByNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
- {
- $this->send_searchExperimentsByNameWithPagination($authzToken, $gatewayId, $userName, $expName, $limit, $offset);
- return $this->recv_searchExperimentsByNameWithPagination();
- }
-
- public function send_searchExperimentsByNameWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_searchExperimentsByNameWithPagination_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->expName = $expName;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByNameWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchExperimentsByNameWithPagination', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchExperimentsByNameWithPagination()
- {
- $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_searchExperimentsByNameWithPagination_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_searchExperimentsByNameWithPagination_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("searchExperimentsByNameWithPagination failed: unknown result");
+ throw new \Exception("searchExperimentsByName failed: unknown result");
}
- public function searchExperimentsByDesc($gatewayId, $userName, $description)
+ public function searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
{
- $this->send_searchExperimentsByDesc($gatewayId, $userName, $description);
+ $this->send_searchExperimentsByDesc($authzToken, $gatewayId, $userName, $description, $limit, $offset);
return $this->recv_searchExperimentsByDesc();
}
- public function send_searchExperimentsByDesc($gatewayId, $userName, $description)
+ public function send_searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
{
$args = new \Airavata\API\Airavata_searchExperimentsByDesc_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$args->description = $description;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -4190,89 +3745,27 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchExperimentsByDesc failed: unknown result");
- }
-
- public function searchExperimentsByDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
- {
- $this->send_searchExperimentsByDescWithPagination($authzToken, $gatewayId, $userName, $description, $limit, $offset);
- return $this->recv_searchExperimentsByDescWithPagination();
- }
-
- public function send_searchExperimentsByDescWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_searchExperimentsByDescWithPagination_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->description = $description;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByDescWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchExperimentsByDescWithPagination', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchExperimentsByDescWithPagination()
- {
- $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_searchExperimentsByDescWithPagination_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_searchExperimentsByDescWithPagination_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("searchExperimentsByDescWithPagination failed: unknown result");
+ throw new \Exception("searchExperimentsByDesc failed: unknown result");
}
- public function searchExperimentsByApplication($gatewayId, $userName, $applicationId)
+ public function searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
{
- $this->send_searchExperimentsByApplication($gatewayId, $userName, $applicationId);
+ $this->send_searchExperimentsByApplication($authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
return $this->recv_searchExperimentsByApplication();
}
- public function send_searchExperimentsByApplication($gatewayId, $userName, $applicationId)
+ public function send_searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
{
$args = new \Airavata\API\Airavata_searchExperimentsByApplication_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$args->applicationId = $applicationId;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -4320,42 +3813,45 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
throw new \Exception("searchExperimentsByApplication failed: unknown result");
}
- public function searchExperimentsByApplicationWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
+ public function searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
{
- $this->send_searchExperimentsByApplicationWithPagination($authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
- return $this->recv_searchExperimentsByApplicationWithPagination();
+ $this->send_searchExperimentsByStatus($authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
+ return $this->recv_searchExperimentsByStatus();
}
- public function send_searchExperimentsByApplicationWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
+ public function send_searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByApplicationWithPagination_args();
+ $args = new \Airavata\API\Airavata_searchExperimentsByStatus_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
- $args->applicationId = $applicationId;
+ $args->experimentState = $experimentState;
$args->limit = $limit;
$args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByApplicationWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'searchExperimentsByStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByApplicationWithPagination', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('searchExperimentsByStatus', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByApplicationWithPagination()
+ public function recv_searchExperimentsByStatus()
{
$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_searchExperimentsByApplicationWithPagination_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_searchExperimentsByStatus_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4369,7 +3865,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByApplicationWithPagination_result();
+ $result = new \Airavata\API\Airavata_searchExperimentsByStatus_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -4388,39 +3884,43 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByApplicationWithPagination failed: unknown result");
+ throw new \Exception("searchExperimentsByStatus failed: unknown result");
}
- public function searchExperimentsByStatus($gatewayId, $userName, $experimentState)
+ public function searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
{
- $this->send_searchExperimentsByStatus($gatewayId, $userName, $experimentState);
- return $this->recv_searchExperimentsByStatus();
+ $this->send_searchExperimentsByCreationTime($authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
+ return $this->recv_searchExperimentsByCreationTime();
}
- public function send_searchExperimentsByStatus($gatewayId, $userName, $experimentState)
+ public function send_searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByStatus_args();
+ $args = new \Airavata\API\Airavata_searchExperimentsByCreationTime_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
- $args->experimentState = $experimentState;
+ $args->fromTime = $fromTime;
+ $args->toTime = $toTime;
+ $args->limit = $limit;
+ $args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'searchExperimentsByCreationTime', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByStatus', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('searchExperimentsByCreationTime', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByStatus()
+ public function recv_searchExperimentsByCreationTime()
{
$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_searchExperimentsByStatus_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_searchExperimentsByCreationTime_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4434,7 +3934,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByStatus_result();
+ $result = new \Airavata\API\Airavata_searchExperimentsByCreationTime_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -4450,42 +3950,45 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchExperimentsByStatus failed: unknown result");
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("searchExperimentsByCreationTime failed: unknown result");
}
- public function searchExperimentsByStatusWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
+ public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $this->send_searchExperimentsByStatusWithPagination($authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
- return $this->recv_searchExperimentsByStatusWithPagination();
+ $this->send_searchExperiments($authzToken, $gatewayId, $userName, $filters, $limit, $offset);
+ return $this->recv_searchExperiments();
}
- public function send_searchExperimentsByStatusWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
+ public function send_searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByStatusWithPagination_args();
+ $args = new \Airavata\API\Airavata_searchExperiments_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
- $args->experimentState = $experimentState;
+ $args->filters = $filters;
$args->limit = $limit;
$args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByStatusWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'searchExperiments', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByStatusWithPagination', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('searchExperiments', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByStatusWithPagination()
+ public function recv_searchExperiments()
{
$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_searchExperimentsByStatusWithPagination_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_searchExperiments_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4499,7 +4002,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByStatusWithPagination_result();
+ $result = new \Airavata\API\Airavata_searchExperiments_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -4518,40 +4021,40 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByStatusWithPagination failed: unknown result");
+ throw new \Exception("searchExperiments failed: unknown result");
}
- public function searchExperimentsByCreationTime($gatewayId, $userName, $fromTime, $toTime)
+ public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
{
- $this->send_searchExperimentsByCreationTime($gatewayId, $userName, $fromTime, $toTime);
- return $this->recv_searchExperimentsByCreationTime();
+ $this->send_getExperimentStatistics($authzToken, $gatewayId, $fromTime, $toTime);
+ return $this->recv_getExperimentStatistics();
}
- public function send_searchExperimentsByCreationTime($gatewayId, $userName, $fromTime, $toTime)
+ public function send_getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByCreationTime_args();
+ $args = new \Airavata\API\Airavata_getExperimentStatistics_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
- $args->userName = $userName;
$args->fromTime = $fromTime;
$args->toTime = $toTime;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByCreationTime', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getExperimentStatistics', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByCreationTime', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getExperimentStatistics', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByCreationTime()
+ public function recv_getExperimentStatistics()
{
$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_searchExperimentsByCreationTime_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getExperimentStatistics_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4565,7 +4068,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByCreationTime_result();
+ $result = new \Airavata\API\Airavata_getExperimentStatistics_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -4581,43 +4084,43 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- throw new \Exception("searchExperimentsByCreationTime failed: unknown result");
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getExperimentStatistics failed: unknown result");
}
- public function searchExperimentsByCreationTimeWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
+ public function getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
{
- $this->send_searchExperimentsByCreationTimeWithPagination($authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
- return $this->recv_searchExperimentsByCreationTimeWithPagination();
+ $this->send_getExperimentsInProject($authzToken, $projectId, $limit, $offset);
+ return $this->recv_getExperimentsInProject();
}
- public function send_searchExperimentsByCreationTimeWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
+ public function send_getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByCreationTimeWithPagination_args();
+ $args = new \Airavata\API\Airavata_getExperimentsInProject_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->fromTime = $fromTime;
- $args->toTime = $toTime;
+ $args->projectId = $projectId;
$args->limit = $limit;
$args->offset = $offset;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'searchExperimentsByCreationTimeWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getExperimentsInProject', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByCreationTimeWithPagination', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getExperimentsInProject', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByCreationTimeWithPagination()
+ public function recv_getExperimentsInProject()
{
$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_searchExperimentsByCreationTimeWithPagination_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getExperimentsInProject_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4631,270 +4134,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByCreationTimeWithPagination_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("searchExperimentsByCreationTimeWithPagination failed: unknown result");
- }
-
- public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
- {
- $this->send_searchExperiments($authzToken, $gatewayId, $userName, $filters, $limit, $offset);
- return $this->recv_searchExperiments();
- }
-
- public function send_searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_searchExperiments_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->filters = $filters;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'searchExperiments', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchExperiments', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchExperiments()
- {
- $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_searchExperiments_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_searchExperiments_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("searchExperiments failed: unknown result");
- }
-
- public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
- {
- $this->send_getExperimentStatistics($authzToken, $gatewayId, $fromTime, $toTime);
- return $this->recv_getExperimentStatistics();
- }
-
- public function send_getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
- {
- $args = new \Airavata\API\Airavata_getExperimentStatistics_args();
- $args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->fromTime = $fromTime;
- $args->toTime = $toTime;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getExperimentStatistics', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getExperimentStatistics', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getExperimentStatistics()
- {
- $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_getExperimentStatistics_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_getExperimentStatistics_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("getExperimentStatistics failed: unknown result");
- }
-
- public function getAllExperimentsInProject($projectId)
- {
- $this->send_getAllExperimentsInProject($projectId);
- return $this->recv_getAllExperimentsInProject();
- }
-
- public function send_getAllExperimentsInProject($projectId)
- {
- $args = new \Airavata\API\Airavata_getAllExperimentsInProject_args();
- $args->projectId = $projectId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getAllExperimentsInProject', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getAllExperimentsInProject', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getAllExperimentsInProject()
- {
- $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_getAllExperimentsInProject_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_getAllExperimentsInProject_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->pnfe !== null) {
- throw $result->pnfe;
- }
- throw new \Exception("getAllExperimentsInProject failed: unknown result");
- }
-
- public function getAllExperimentsInProjectWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
- {
- $this->send_getAllExperimentsInProjectWithPagination($authzToken, $projectId, $limit, $offset);
- return $this->recv_getAllExperimentsInProjectWithPagination();
- }
-
- public function send_getAllExperimentsInProjectWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
- {
- $args = new \Airavata\API\Airavata_getAllExperimentsInProjectWithPagination_args();
- $args->authzToken = $authzToken;
- $args->projectId = $projectId;
- $args->limit = $limit;
- $args->offset = $offset;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getAllExperimentsInProjectWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getAllExperimentsInProjectWithPagination', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getAllExperimentsInProjectWithPagination()
- {
- $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_getAllExperimentsInProjectWithPagination_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_getAllExperimentsInProjectWithPagination_result();
+ $result = new \Airavata\API\Airavata_getExperimentsInProject_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -4916,79 +4156,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getAllExperimentsInProjectWithPagination failed: unknown result");
- }
-
- public function getAllUserExperiments($gatewayId, $userName)
- {
- $this->send_getAllUserExperiments($gatewayId, $userName);
- return $this->recv_getAllUserExperiments();
- }
-
- public function send_getAllUserExperiments($gatewayId, $userName)
- {
- $args = new \Airavata\API\Airavata_getAllUserExperiments_args();
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getAllUserExperiments', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getAllUserExperiments', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getAllUserExperiments()
- {
- $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_getAllUserExperiments_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_getAllUserExperiments_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;
- }
- throw new \Exception("getAllUserExperiments failed: unknown result");
+ throw new \Exception("getExperimentsInProject failed: unknown result");
}
- public function getAllUserExperimentsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
+ public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $this->send_getAllUserExperimentsWithPagination($authzToken, $gatewayId, $userName, $limit, $offset);
- return $this->recv_getAllUserExperimentsWithPagination();
+ $this->send_getUserExperiments($authzToken, $gatewayId, $userName, $limit, $offset);
+ return $this->recv_getUserExperiments();
}
- public function send_getAllUserExperimentsWithPagination(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
+ public function send_getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_getAllUserExperimentsWithPagination_args();
+ $args = new \Airavata\API\Airavata_getUserExperiments_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
@@ -4997,21 +4176,21 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getAllUserExperimentsWithPagination', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getUserExperiments', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getAllUserExperimentsWithPagination', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getUserExperiments', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getAllUserExperimentsWithPagination()
+ public function recv_getUserExperiments()
{
$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_getAllUserExperimentsWithPagination_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getUserExperiments_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5025,7 +4204,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getAllUserExperimentsWithPagination_result();
+ $result = new \Airavata\API\Airavata_getUserExperiments_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5044,7 +4223,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getAllUserExperimentsWithPagination failed: unknown result");
+ throw new \Exception("getUserExperiments failed: unknown result");
}
public function createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
@@ -14820,10 +13999,14 @@ class Airavata_deleteProject_result {
}
-class Airavata_getAllUserProjects_args {
+class Airavata_getUserProjects_args {
static $_TSPEC;
/**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
* @var string
*/
public $gatewayId = null;
@@ -14831,32 +14014,62 @@ class Airavata_getAllUserProjects_args {
* @var string
*/
public $userName = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 2 => array(
+ 3 => array(
'var' => 'userName',
'type' => TType::STRING,
),
+ 4 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
);
}
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'];
}
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllUserProjects_args';
+ return 'Airavata_getUserProjects_args';
}
public function read($input)
@@ -14875,19 +14088,41 @@ class Airavata_getAllUserProjects_args {
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;
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 2:
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14900,17 +14135,35 @@ class Airavata_getAllUserProjects_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserProjects_args');
+ $xfer += $output->writeStructBegin('Airavata_getUserProjects_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();
+ }
if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 1);
+ $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, 2);
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14918,7 +14171,7 @@ class Airavata_getAllUserProjects_args {
}
-class Airavata_getAllUserProjects_result {
+class Airavata_getUserProjects_result {
static $_TSPEC;
/**
@@ -14937,6 +14190,10 @@ class Airavata_getAllUserProjects_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)) {
@@ -14965,6 +14222,11 @@ class Airavata_getAllUserProjects_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)) {
@@ -14980,11 +14242,14 @@ class Airavata_getAllUserProjects_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllUserProjects_result';
+ return 'Airavata_getUserProjects_result';
}
public function read($input)
@@ -15044,6 +14309,14 @@ class Airavata_getAllUserProjects_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;
@@ -15056,7 +14329,7 @@ class Airavata_getAllUserProjects_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserProjects_result');
+ $xfer += $output->writeStructBegin('Airavata_getUserProjects_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15089,6 +14362,11 @@ class Airavata_getAllUserProjects_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;
@@ -15096,7 +14374,7 @@ class Airavata_getAllUserProjects_result {
}
-class Airavata_getAllUserProjectsWithPagination_args {
+class Airavata_searchProjectsByProjectName_args {
static $_TSPEC;
/**
@@ -15112,6 +14390,10 @@ class Airavata_getAllUserProjectsWithPagination_args {
*/
public $userName = null;
/**
+ * @var string
+ */
+ public $projectName = null;
+ /**
* @var int
*/
public $limit = null;
@@ -15137,10 +14419,14 @@ class Airavata_getAllUserProjectsWithPagination_args {
'type' => TType::STRING,
),
4 => array(
+ 'var' => 'projectName',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
'var' => 'limit',
'type' => TType::I32,
),
- 5 => array(
+ 6 => array(
'var' => 'offset',
'type' => TType::I32,
),
@@ -15156,6 +14442,9 @@ class Airavata_getAllUserProjectsWithPagination_args {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
+ if (isset($vals['projectName'])) {
+ $this->projectName = $vals['projectName'];
+ }
if (isset($vals['limit'])) {
$this->limit = $vals['limit'];
}
@@ -15166,7 +14455,7 @@ class Airavata_getAllUserProjectsWithPagination_args {
}
public function getName() {
- return 'Airavata_getAllUserProjectsWithPagination_args';
+ return 'Airavata_searchProjectsByProjectName_args';
}
public function read($input)
@@ -15207,13 +14496,20 @@ class Airavata_getAllUserProjectsWithPagination_args {
}
break;
case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->projectName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->limit);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 6:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->offset);
} else {
@@ -15232,7 +14528,7 @@ class Airavata_getAllUserProjectsWithPagination_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserProjectsWithPagination_args');
+ $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectName_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15251,13 +14547,18 @@ class Airavata_getAllUserProjectsWithPagination_args {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
+ if ($this->projectName !== null) {
+ $xfer += $output->writeFieldBegin('projectName', TType::STRING, 4);
+ $xfer += $output->writeString($this->projectName);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
$xfer += $output->writeI32($this->limit);
$xfer += $output->writeFieldEnd();
}
if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
$xfer += $output->writeI32($this->offset);
$xfer += $output->writeFieldEnd();
}
@@ -15268,7 +14569,7 @@ class Airavata_getAllUserProjectsWithPagination_args {
}
-class Airavata_getAllUserProjectsWithPagination_result {
+class Airavata_searchProjectsByProjectName_result {
static $_TSPEC;
/**
@@ -15346,7 +14647,7 @@ class Airavata_getAllUserProjectsWithPagination_result {
}
public function getName() {
- return 'Airavata_getAllUserProjectsWithPagination_result';
+ return 'Airavata_searchProjectsByProjectName_result';
}
public function read($input)
@@ -15426,7 +14727,7 @@ class Airavata_getAllUserProjectsWithPagination_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserProjectsWithPagination_result');
+ $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectName_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15471,10 +14772,14 @@ class Airavata_getAllUserProjectsWithPagination_result {
}
-class Airavata_searchProjectsByProjectName_args {
+class Airavata_searchProjectsByProjectDesc_args {
static $_TSPEC;
/**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
* @var string
*/
public $gatewayId = null;
@@ -15485,40 +14790,70 @@ class Airavata_searchProjectsByProjectName_args {
/**
* @var string
*/
- public $projectName = null;
+ public $description = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 2 => array(
+ 3 => array(
'var' => 'userName',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'projectName',
+ 4 => array(
+ 'var' => 'description',
'type' => TType::STRING,
),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
);
}
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'];
}
- if (isset($vals['projectName'])) {
- $this->projectName = $vals['projectName'];
+ if (isset($vals['description'])) {
+ $this->description = $vals['description'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
}
}
}
public function getName() {
- return 'Airavata_searchProjectsByProjectName_args';
+ return 'Airavata_searchProjectsByProjectDesc_args';
}
public function read($input)
@@ -15537,22 +14872,44 @@ class Airavata_searchProjectsByProjectName_args {
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;
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 2:
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 3:
+ case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectName);
+ $xfer += $input->readString($this->description);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
} else {
$xfer += $input->skip($ftype);
}
@@ -15569,20 +14926,38 @@ class Airavata_searchProjectsByProjectName_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectName_args');
+ $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectDesc_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();
+ }
if ($this->gatewayId !== null) {
<TRUNCATED>
[02/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py
index b3c034e..ae922f1 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/constants.py
@@ -9,4 +9,4 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
-AIRAVATA_API_VERSION = "0.15.0"
+AIRAVATA_API_VERSION = "0.16.0"
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
index d5ba6a1..42314f2 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
@@ -346,7 +346,7 @@ public class CreateLaunchBES {
public static List<ExperimentModel> getExperimentsForUser(Airavata.Client client, String user) {
try {
- return client.getAllUserExperiments(DEFAULT_GATEWAY, user);
+ return client.getUserExperiments(new AuthzToken(""), DEFAULT_GATEWAY, user, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -361,7 +361,7 @@ public class CreateLaunchBES {
public static List<Project> getAllUserProject(Airavata.Client client, String user) {
try {
- return client.getAllUserProjects(DEFAULT_GATEWAY, user);
+ return client.getUserProjects(new AuthzToken(""), DEFAULT_GATEWAY, user, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -376,7 +376,7 @@ public class CreateLaunchBES {
public static List<Project> searchProjectsByProjectName(Airavata.Client client, String user, String projectName) {
try {
- return client.searchProjectsByProjectName(DEFAULT_GATEWAY, user, projectName);
+ return client.searchProjectsByProjectName(new AuthzToken(""), DEFAULT_GATEWAY, user, projectName, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -391,7 +391,7 @@ public class CreateLaunchBES {
public static List<Project> searchProjectsByProjectDesc(Airavata.Client client, String user, String desc) {
try {
- return client.searchProjectsByProjectDesc(DEFAULT_GATEWAY, user, desc);
+ return client.searchProjectsByProjectDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -407,7 +407,7 @@ public class CreateLaunchBES {
public static List<ExperimentSummaryModel> searchExperimentsByName(Airavata.Client client, String user, String expName) {
try {
- return client.searchExperimentsByName(DEFAULT_GATEWAY, user, expName);
+ return client.searchExperimentsByName(new AuthzToken(""), DEFAULT_GATEWAY, user, expName, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -422,7 +422,7 @@ public class CreateLaunchBES {
public static List<ExperimentSummaryModel> searchExperimentsByDesc(Airavata.Client client, String user, String desc) {
try {
- return client.searchExperimentsByDesc(DEFAULT_GATEWAY, user, desc);
+ return client.searchExperimentsByDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -437,7 +437,7 @@ public class CreateLaunchBES {
public static List<ExperimentSummaryModel> searchExperimentsByApplication(Airavata.Client client, String user, String app) {
try {
- return client.searchExperimentsByApplication(DEFAULT_GATEWAY, user, app);
+ return client.searchExperimentsByApplication(new AuthzToken(""), DEFAULT_GATEWAY, user, app, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 00cff0b..21eedf5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -1463,7 +1463,7 @@ public class CreateLaunchExperiment {
public static List<ExperimentModel> getExperimentsForUser(Airavata.Client client, String user) {
try {
- return client.getAllUserExperiments(DEFAULT_GATEWAY, user);
+ return client.getUserExperiments(new AuthzToken(""), DEFAULT_GATEWAY, user, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1478,7 +1478,7 @@ public class CreateLaunchExperiment {
public static List<Project> getAllUserProject(Airavata.Client client, String user) {
try {
- return client.getAllUserProjects(DEFAULT_GATEWAY, user);
+ return client.getUserProjects(new AuthzToken(""), DEFAULT_GATEWAY, user, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1493,7 +1493,7 @@ public class CreateLaunchExperiment {
public static List<Project> searchProjectsByProjectName(Airavata.Client client, String user, String projectName) {
try {
- return client.searchProjectsByProjectName(DEFAULT_GATEWAY, user, projectName);
+ return client.searchProjectsByProjectName(new AuthzToken(""), DEFAULT_GATEWAY, user, projectName, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1508,7 +1508,7 @@ public class CreateLaunchExperiment {
public static List<Project> searchProjectsByProjectDesc(Airavata.Client client, String user, String desc) {
try {
- return client.searchProjectsByProjectDesc(DEFAULT_GATEWAY, user, desc);
+ return client.searchProjectsByProjectDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1524,7 +1524,7 @@ public class CreateLaunchExperiment {
public static List<ExperimentSummaryModel> searchExperimentsByName(Airavata.Client client, String user, String expName) {
try {
- return client.searchExperimentsByName(DEFAULT_GATEWAY, user, expName);
+ return client.searchExperimentsByName(new AuthzToken(""), DEFAULT_GATEWAY, user, expName, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1539,7 +1539,7 @@ public class CreateLaunchExperiment {
public static List<ExperimentSummaryModel> searchExperimentsByDesc(Airavata.Client client, String user, String desc) {
try {
- return client.searchExperimentsByDesc(DEFAULT_GATEWAY, user, desc);
+ return client.searchExperimentsByDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
@@ -1554,7 +1554,7 @@ public class CreateLaunchExperiment {
public static List<ExperimentSummaryModel> searchExperimentsByApplication(Airavata.Client client, String user, String app) {
try {
- return client.searchExperimentsByApplication(DEFAULT_GATEWAY, user, app);
+ return client.searchExperimentsByApplication(new AuthzToken(""), DEFAULT_GATEWAY, user, app, -1, 0);
} catch (AiravataSystemException e) {
e.printStackTrace();
} catch (InvalidRequestException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index 6f66aac..683090c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 714dbec..50af806 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 02f4a43..bee403b 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 b667e71..7c815bc 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
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* value:
* Value of the environment variable to set
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 e35aa68..8a7e4af 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 8382a16..83e51ce 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 9238baa..4fb0364 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 5f38ba8..845633e 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
index 1e7c83e..80e18bd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 087160f..c8522a1 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index 4b0ca9c..e67289b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 37b3fad..eb3a8d0 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
index 8bb8b64..46bdfe7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 72e72fe..0cfe509 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 93a7dde..c863803 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index a9a6b74..d341ea7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 c093005..4763ac9 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
@@ -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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
index f927a54..bb47669 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 3fe05ca..2b3cb3f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 386e7d2..f830898 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
@@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory;
* account to be used has to be added to the allocation.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 ac77c29..3c36791 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
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 66de03e..773c99a 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 56e254b..6869b4f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 4ed6a22..7bce8de 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 6bc7bda..20c16d7 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 1703475..7e4ee5c 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 87976a0..7706e6f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 85fb474..d455fe6 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 16e15c7..76103d5 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 48f82be..875a0d2 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 614f9dd..7414d74 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 5316c12..4ab1e48 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 0daa9aa..ba51235 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 56faf1d..798188f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 a0e9004..929e2a6 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 4eddc9d..1c9633e 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 aa785ef..0edbe43 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 2c8d6a6..c36294c 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 3e29e1b..0d16761 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 e087960..0b60ed0 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 55abd1a..3fb384b 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 f92661a..7bd252f 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 38d1b77..d4f9538 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 046fe9a..e7ceeaf 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 f100ccb..ff4d5a4 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 a664b1d..3a302c0 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 fc37413..0ab05c7 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 a59b5af..6c29b24 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 d4e4f76..92d4c04 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 975912a..c8de5ed 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 4ba15f4..07efd62 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 3f0ff64..7e3b54a 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 6c5697e..1f16b56 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 c84dde4..5658f55 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 c6a50f5..fef4808 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 644dcb1..30bf5f3 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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/dc61c676/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 d5d09f7..dbf6111 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.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
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");
[10/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 062c4f3..c52fe55 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-1")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-8-3")
public class Airavata {
public interface Iface {
@@ -139,22 +139,6 @@ public class Airavata {
public boolean deleteProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
- * * Get all Project by user
- * *
- * * @param gatewayId
- * * The identifier for the requested gateway.
- * *
- * * @param userName
- * * The Project Object described in the workspace_model
- * * @deprecated Instead use getAllUserProjectsWithPagination
- * *
- *
- * @param gatewayId
- * @param userName
- */
- public List<org.apache.airavata.model.workspace.Project> getAllUserProjects(String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
-
- /**
* * Get all Project by user with pagination. Results will be ordered based
* * on creation time DESC
* *
@@ -174,24 +158,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.workspace.Project> getAllUserProjectsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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;
-
- /**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param projectName
- */
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectName(String gatewayId, String userName, String projectName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.workspace.Project> getUserProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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;
/**
* Get all Project for user by project name with pagination.Results will be ordered based
@@ -215,23 +182,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) 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;
-
- /**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDesc(String gatewayId, String userName, String description) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) 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;
/**
* Search and get all Projects for user by project description with pagination. Results
@@ -255,26 +206,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param useNname
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- *
- * @param gatewayId
- * @param userName
- * @param expName
- */
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByName(String gatewayId, String userName, String expName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -298,25 +230,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) 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;
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDesc(String gatewayId, String userName, String description) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) 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;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -340,25 +254,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
-
- /**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplicationWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param applicationId
- */
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplication(String gatewayId, String userName, String applicationId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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;
/**
* Search Experiments by application id with pagination. Results will be sorted
@@ -382,25 +278,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplicationWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) 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;
-
- /**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiement state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param experimentState
- */
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatus(String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplication(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) 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;
/**
* Search Experiments by experiment status with pagination. Results will be sorted
@@ -424,28 +302,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatusWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) 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;
-
- /**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTimeWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- */
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTime(String gatewayId, String userName, long fromTime, long toTime) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatus(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) 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;
/**
* Search Experiments by experiment creation time with pagination. Results will be sorted
@@ -472,7 +329,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTime(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) 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;
/**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
@@ -516,19 +373,7 @@ public class Airavata {
public org.apache.airavata.model.experiment.ExperimentStatistics getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) 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;
/**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- *
- * @param projectId
- */
- public List<org.apache.airavata.model.experiment.ExperimentModel> getAllExperimentsInProject(String projectId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.thrift.TException;
-
- /**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -543,25 +388,10 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentModel> getAllExperimentsInProjectWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
-
- /**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- *
- * @param gatewayId
- * @param userName
- */
- public List<org.apache.airavata.model.experiment.ExperimentModel> getAllUserExperiments(String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.experiment.ExperimentModel> getExperimentsInProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get experiments by user with pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -579,7 +409,7 @@ public class Airavata {
* @param limit
* @param offset
*/
- public List<org.apache.airavata.model.experiment.ExperimentModel> getAllUserExperimentsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentModel> getUserExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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;
/**
* Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
@@ -1946,49 +1776,29 @@ public class Airavata {
public void deleteProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllUserProjects(String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getUserProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllUserProjectsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchProjectsByProjectName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchProjectsByProjectName(String gatewayId, String userName, String projectName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchProjectsByProjectDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchProjectsByProjectNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchExperimentsByName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchProjectsByProjectDesc(String gatewayId, String userName, String description, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchExperimentsByDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchProjectsByProjectDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchExperimentsByApplication(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchExperimentsByName(String gatewayId, String userName, String expName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchExperimentsByStatus(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void searchExperimentsByNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByDesc(String gatewayId, String userName, String description, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByApplication(String gatewayId, String userName, String applicationId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByApplicationWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByStatus(String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByStatusWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByCreationTime(String gatewayId, String userName, long fromTime, long toTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void searchExperimentsByCreationTimeWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void searchExperimentsByCreationTime(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllExperimentsInProject(String projectId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void getAllExperimentsInProjectWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getExperimentsInProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllUserExperiments(String gatewayId, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void getAllUserExperimentsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getUserExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void createExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.experiment.ExperimentModel experiment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -2691,24 +2501,27 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteProject failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> getAllUserProjects(String gatewayId, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.workspace.Project> getUserProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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_getAllUserProjects(gatewayId, userName);
- return recv_getAllUserProjects();
+ send_getUserProjects(authzToken, gatewayId, userName, limit, offset);
+ return recv_getUserProjects();
}
- public void send_getAllUserProjects(String gatewayId, String userName) throws org.apache.thrift.TException
+ public void send_getUserProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) throws org.apache.thrift.TException
{
- getAllUserProjects_args args = new getAllUserProjects_args();
+ getUserProjects_args args = new getUserProjects_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- sendBase("getAllUserProjects", args);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("getUserProjects", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_getAllUserProjects() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.workspace.Project> recv_getUserProjects() 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
{
- getAllUserProjects_result result = new getAllUserProjects_result();
- receiveBase(result, "getAllUserProjects");
+ getUserProjects_result result = new getUserProjects_result();
+ receiveBase(result, "getUserProjects");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2721,30 +2534,34 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllUserProjects failed: unknown result");
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserProjects failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> getAllUserProjectsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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<org.apache.airavata.model.workspace.Project> searchProjectsByProjectName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) 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_getAllUserProjectsWithPagination(authzToken, gatewayId, userName, limit, offset);
- return recv_getAllUserProjectsWithPagination();
+ send_searchProjectsByProjectName(authzToken, gatewayId, userName, projectName, limit, offset);
+ return recv_searchProjectsByProjectName();
}
- public void send_getAllUserProjectsWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) throws org.apache.thrift.TException
+ public void send_searchProjectsByProjectName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) throws org.apache.thrift.TException
{
- getAllUserProjectsWithPagination_args args = new getAllUserProjectsWithPagination_args();
+ searchProjectsByProjectName_args args = new searchProjectsByProjectName_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
+ args.setProjectName(projectName);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("getAllUserProjectsWithPagination", args);
+ sendBase("searchProjectsByProjectName", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_getAllUserProjectsWithPagination() 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<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectName() 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
{
- getAllUserProjectsWithPagination_result result = new getAllUserProjectsWithPagination_result();
- receiveBase(result, "getAllUserProjectsWithPagination");
+ searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
+ receiveBase(result, "searchProjectsByProjectName");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2760,28 +2577,31 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllUserProjectsWithPagination failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectName(String gatewayId, String userName, String projectName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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_searchProjectsByProjectName(gatewayId, userName, projectName);
- return recv_searchProjectsByProjectName();
+ send_searchProjectsByProjectDesc(authzToken, gatewayId, userName, description, limit, offset);
+ return recv_searchProjectsByProjectDesc();
}
- public void send_searchProjectsByProjectName(String gatewayId, String userName, String projectName) throws org.apache.thrift.TException
+ public void send_searchProjectsByProjectDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) throws org.apache.thrift.TException
{
- searchProjectsByProjectName_args args = new searchProjectsByProjectName_args();
+ searchProjectsByProjectDesc_args args = new searchProjectsByProjectDesc_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setProjectName(projectName);
- sendBase("searchProjectsByProjectName", args);
+ args.setDescription(description);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("searchProjectsByProjectDesc", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectName() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectDesc() 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
{
- searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
- receiveBase(result, "searchProjectsByProjectName");
+ searchProjectsByProjectDesc_result result = new searchProjectsByProjectDesc_result();
+ receiveBase(result, "searchProjectsByProjectDesc");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2794,31 +2614,34 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) 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_searchProjectsByProjectNameWithPagination(authzToken, gatewayId, userName, projectName, limit, offset);
- return recv_searchProjectsByProjectNameWithPagination();
+ send_searchExperimentsByName(authzToken, gatewayId, userName, expName, limit, offset);
+ return recv_searchExperimentsByName();
}
- public void send_searchProjectsByProjectNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset) throws org.apache.thrift.TException
+ public void send_searchExperimentsByName(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) throws org.apache.thrift.TException
{
- searchProjectsByProjectNameWithPagination_args args = new searchProjectsByProjectNameWithPagination_args();
+ searchExperimentsByName_args args = new searchExperimentsByName_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setProjectName(projectName);
+ args.setExpName(expName);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("searchProjectsByProjectNameWithPagination", args);
+ sendBase("searchExperimentsByName", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectNameWithPagination() 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByName() 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
{
- searchProjectsByProjectNameWithPagination_result result = new searchProjectsByProjectNameWithPagination_result();
- receiveBase(result, "searchProjectsByProjectNameWithPagination");
+ searchExperimentsByName_result result = new searchExperimentsByName_result();
+ receiveBase(result, "searchExperimentsByName");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2834,28 +2657,31 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectNameWithPagination failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByName failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDesc(String gatewayId, String userName, String description) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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_searchProjectsByProjectDesc(gatewayId, userName, description);
- return recv_searchProjectsByProjectDesc();
+ send_searchExperimentsByDesc(authzToken, gatewayId, userName, description, limit, offset);
+ return recv_searchExperimentsByDesc();
}
- public void send_searchProjectsByProjectDesc(String gatewayId, String userName, String description) throws org.apache.thrift.TException
+ public void send_searchExperimentsByDesc(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) throws org.apache.thrift.TException
{
- searchProjectsByProjectDesc_args args = new searchProjectsByProjectDesc_args();
+ searchExperimentsByDesc_args args = new searchExperimentsByDesc_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
args.setDescription(description);
- sendBase("searchProjectsByProjectDesc", args);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("searchExperimentsByDesc", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectDesc() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByDesc() 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
{
- searchProjectsByProjectDesc_result result = new searchProjectsByProjectDesc_result();
- receiveBase(result, "searchProjectsByProjectDesc");
+ searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
+ receiveBase(result, "searchExperimentsByDesc");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2868,31 +2694,34 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
}
- public List<org.apache.airavata.model.workspace.Project> searchProjectsByProjectDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplication(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) 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_searchProjectsByProjectDescWithPagination(authzToken, gatewayId, userName, description, limit, offset);
- return recv_searchProjectsByProjectDescWithPagination();
+ send_searchExperimentsByApplication(authzToken, gatewayId, userName, applicationId, limit, offset);
+ return recv_searchExperimentsByApplication();
}
- public void send_searchProjectsByProjectDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) throws org.apache.thrift.TException
+ public void send_searchExperimentsByApplication(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) throws org.apache.thrift.TException
{
- searchProjectsByProjectDescWithPagination_args args = new searchProjectsByProjectDescWithPagination_args();
+ searchExperimentsByApplication_args args = new searchExperimentsByApplication_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setDescription(description);
+ args.setApplicationId(applicationId);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("searchProjectsByProjectDescWithPagination", args);
+ sendBase("searchExperimentsByApplication", args);
}
- public List<org.apache.airavata.model.workspace.Project> recv_searchProjectsByProjectDescWithPagination() 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByApplication() 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
{
- searchProjectsByProjectDescWithPagination_result result = new searchProjectsByProjectDescWithPagination_result();
- receiveBase(result, "searchProjectsByProjectDescWithPagination");
+ searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
+ receiveBase(result, "searchExperimentsByApplication");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2908,28 +2737,31 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectDescWithPagination failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByName(String gatewayId, String userName, String expName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatus(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) 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_searchExperimentsByName(gatewayId, userName, expName);
- return recv_searchExperimentsByName();
+ send_searchExperimentsByStatus(authzToken, gatewayId, userName, experimentState, limit, offset);
+ return recv_searchExperimentsByStatus();
}
- public void send_searchExperimentsByName(String gatewayId, String userName, String expName) throws org.apache.thrift.TException
+ public void send_searchExperimentsByStatus(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) throws org.apache.thrift.TException
{
- searchExperimentsByName_args args = new searchExperimentsByName_args();
+ searchExperimentsByStatus_args args = new searchExperimentsByStatus_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setExpName(expName);
- sendBase("searchExperimentsByName", args);
+ args.setExperimentState(experimentState);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("searchExperimentsByStatus", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByName() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByStatus() 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
{
- searchExperimentsByName_result result = new searchExperimentsByName_result();
- receiveBase(result, "searchExperimentsByName");
+ searchExperimentsByStatus_result result = new searchExperimentsByStatus_result();
+ receiveBase(result, "searchExperimentsByStatus");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2942,31 +2774,35 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByName failed: unknown result");
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTime(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) 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_searchExperimentsByNameWithPagination(authzToken, gatewayId, userName, expName, limit, offset);
- return recv_searchExperimentsByNameWithPagination();
+ send_searchExperimentsByCreationTime(authzToken, gatewayId, userName, fromTime, toTime, limit, offset);
+ return recv_searchExperimentsByCreationTime();
}
- public void send_searchExperimentsByNameWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset) throws org.apache.thrift.TException
+ public void send_searchExperimentsByCreationTime(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) throws org.apache.thrift.TException
{
- searchExperimentsByNameWithPagination_args args = new searchExperimentsByNameWithPagination_args();
+ searchExperimentsByCreationTime_args args = new searchExperimentsByCreationTime_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setExpName(expName);
+ args.setFromTime(fromTime);
+ args.setToTime(toTime);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("searchExperimentsByNameWithPagination", args);
+ sendBase("searchExperimentsByCreationTime", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByNameWithPagination() 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<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByCreationTime() 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
{
- searchExperimentsByNameWithPagination_result result = new searchExperimentsByNameWithPagination_result();
- receiveBase(result, "searchExperimentsByNameWithPagination");
+ searchExperimentsByCreationTime_result result = new searchExperimentsByCreationTime_result();
+ receiveBase(result, "searchExperimentsByCreationTime");
if (result.isSetSuccess()) {
return result.success;
}
@@ -2982,28 +2818,31 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByNameWithPagination failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDesc(String gatewayId, String userName, String description) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset) 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_searchExperimentsByDesc(gatewayId, userName, description);
- return recv_searchExperimentsByDesc();
+ send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset);
+ return recv_searchExperiments();
}
- public void send_searchExperimentsByDesc(String gatewayId, String userName, String description) throws org.apache.thrift.TException
+ public void send_searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset) throws org.apache.thrift.TException
{
- searchExperimentsByDesc_args args = new searchExperimentsByDesc_args();
+ searchExperiments_args args = new searchExperiments_args();
+ args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setDescription(description);
- sendBase("searchExperimentsByDesc", args);
+ args.setFilters(filters);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("searchExperiments", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByDesc() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperiments() 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
{
- searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
- receiveBase(result, "searchExperimentsByDesc");
+ searchExperiments_result result = new searchExperiments_result();
+ receiveBase(result, "searchExperiments");
if (result.isSetSuccess()) {
return result.success;
}
@@ -3016,31 +2855,32 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperiments failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) 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 org.apache.airavata.model.experiment.ExperimentStatistics getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) 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_searchExperimentsByDescWithPagination(authzToken, gatewayId, userName, description, limit, offset);
- return recv_searchExperimentsByDescWithPagination();
+ send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime);
+ return recv_getExperimentStatistics();
}
- public void send_searchExperimentsByDescWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset) throws org.apache.thrift.TException
+ public void send_getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) throws org.apache.thrift.TException
{
- searchExperimentsByDescWithPagination_args args = new searchExperimentsByDescWithPagination_args();
+ getExperimentStatistics_args args = new getExperimentStatistics_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setDescription(description);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByDescWithPagination", args);
+ args.setFromTime(fromTime);
+ args.setToTime(toTime);
+ sendBase("getExperimentStatistics", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByDescWithPagination() 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 org.apache.airavata.model.experiment.ExperimentStatistics recv_getExperimentStatistics() 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
{
- searchExperimentsByDescWithPagination_result result = new searchExperimentsByDescWithPagination_result();
- receiveBase(result, "searchExperimentsByDescWithPagination");
+ getExperimentStatistics_result result = new getExperimentStatistics_result();
+ receiveBase(result, "getExperimentStatistics");
if (result.isSetSuccess()) {
return result.success;
}
@@ -3056,28 +2896,29 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByDescWithPagination failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getExperimentStatistics failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplication(String gatewayId, String userName, String applicationId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentModel> getExperimentsInProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_searchExperimentsByApplication(gatewayId, userName, applicationId);
- return recv_searchExperimentsByApplication();
+ send_getExperimentsInProject(authzToken, projectId, limit, offset);
+ return recv_getExperimentsInProject();
}
- public void send_searchExperimentsByApplication(String gatewayId, String userName, String applicationId) throws org.apache.thrift.TException
+ public void send_getExperimentsInProject(org.apache.airavata.model.security.AuthzToken authzToken, String projectId, int limit, int offset) throws org.apache.thrift.TException
{
- searchExperimentsByApplication_args args = new searchExperimentsByApplication_args();
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setApplicationId(applicationId);
- sendBase("searchExperimentsByApplication", args);
+ getExperimentsInProject_args args = new getExperimentsInProject_args();
+ args.setAuthzToken(authzToken);
+ args.setProjectId(projectId);
+ args.setLimit(limit);
+ args.setOffset(offset);
+ sendBase("getExperimentsInProject", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByApplication() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.experiment.ExperimentModel> recv_getExperimentsInProject() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.ProjectNotFoundException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
- receiveBase(result, "searchExperimentsByApplication");
+ getExperimentsInProject_result result = new getExperimentsInProject_result();
+ receiveBase(result, "getExperimentsInProject");
if (result.isSetSuccess()) {
return result.success;
}
@@ -3090,31 +2931,36 @@ public class Airavata {
if (result.ase != null) {
throw result.ase;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
+ if (result.pnfe != null) {
+ throw result.pnfe;
+ }
+ if (result.ae != null) {
+ throw result.ae;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getExperimentsInProject failed: unknown result");
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByApplicationWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) 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<org.apache.airavata.model.experiment.ExperimentModel> getUserExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) 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_searchExperimentsByApplicationWithPagination(authzToken, gatewayId, userName, applicationId, limit, offset);
- return recv_searchExperimentsByApplicationWithPagination();
+ send_getUserExperiments(authzToken, gatewayId, userName, limit, offset);
+ return recv_getUserExperiments();
}
- public void send_searchExperimentsByApplicationWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset) throws org.apache.thrift.TException
+ public void send_getUserExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, int limit, int offset) throws org.apache.thrift.TException
{
- searchExperimentsByApplicationWithPagination_args args = new searchExperimentsByApplicationWithPagination_args();
+ getUserExperiments_args args = new getUserExperiments_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setApplicationId(applicationId);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("searchExperimentsByApplicationWithPagination", args);
+ sendBase("getUserExperiments", args);
}
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByApplicationWithPagination() 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<org.apache.airavata.model.experiment.ExperimentModel> recv_getUserExperiments() 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
{
- searchExperimentsByApplicationWithPagination_result result = new searchExperimentsByApplicationWithPagination_result();
- receiveBase(result, "searchExperimentsByApplicationWithPagination");
+ getUserExperiments_result result = new getUserExperiments_result();
+ receiveBase(result, "getUserExperiments");
if (result.isSetSuccess()) {
return result.success;
}
@@ -3130,383 +2976,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByApplicationWithPagination failed: unknown result");
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatus(String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
- {
- send_searchExperimentsByStatus(gatewayId, userName, experimentState);
- return recv_searchExperimentsByStatus();
- }
-
- public void send_searchExperimentsByStatus(String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState) throws org.apache.thrift.TException
- {
- searchExperimentsByStatus_args args = new searchExperimentsByStatus_args();
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExperimentState(experimentState);
- sendBase("searchExperimentsByStatus", args);
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByStatus() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
- {
- searchExperimentsByStatus_result result = new searchExperimentsByStatus_result();
- receiveBase(result, "searchExperimentsByStatus");
- 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;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByStatusWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) 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_searchExperimentsByStatusWithPagination(authzToken, gatewayId, userName, experimentState, limit, offset);
- return recv_searchExperimentsByStatusWithPagination();
- }
-
- public void send_searchExperimentsByStatusWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, org.apache.airavata.model.status.ExperimentState experimentState, int limit, int offset) throws org.apache.thrift.TException
- {
- searchExperimentsByStatusWithPagination_args args = new searchExperimentsByStatusWithPagination_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExperimentState(experimentState);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByStatusWithPagination", args);
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByStatusWithPagination() 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
- {
- searchExperimentsByStatusWithPagination_result result = new searchExperimentsByStatusWithPagination_result();
- receiveBase(result, "searchExperimentsByStatusWithPagination");
- 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, "searchExperimentsByStatusWithPagination failed: unknown result");
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTime(String gatewayId, String userName, long fromTime, long toTime) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
- {
- send_searchExperimentsByCreationTime(gatewayId, userName, fromTime, toTime);
- return recv_searchExperimentsByCreationTime();
- }
-
- public void send_searchExperimentsByCreationTime(String gatewayId, String userName, long fromTime, long toTime) throws org.apache.thrift.TException
- {
- searchExperimentsByCreationTime_args args = new searchExperimentsByCreationTime_args();
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setFromTime(fromTime);
- args.setToTime(toTime);
- sendBase("searchExperimentsByCreationTime", args);
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByCreationTime() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
- {
- searchExperimentsByCreationTime_result result = new searchExperimentsByCreationTime_result();
- receiveBase(result, "searchExperimentsByCreationTime");
- 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;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperimentsByCreationTimeWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) 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_searchExperimentsByCreationTimeWithPagination(authzToken, gatewayId, userName, fromTime, toTime, limit, offset);
- return recv_searchExperimentsByCreationTimeWithPagination();
- }
-
- public void send_searchExperimentsByCreationTimeWithPagination(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, long fromTime, long toTime, int limit, int offset) throws org.apache.thrift.TException
- {
- searchExperimentsByCreationTimeWithPagination_args args = new searchExperimentsByCreationTimeWithPagination_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setFromTime(fromTime);
- args.setToTime(toTime);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByCreationTimeWithPagination", args);
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperimentsByCreationTimeWithPagination() 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
- {
- searchExperimentsByCreationTimeWithPagination_result result = new searchExperimentsByCreationTimeWithPagination_result();
- receiveBase(result, "searchExperimentsByCreationTimeWithPagination");
- 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, "searchExperimentsByCreationTimeWithPagination failed: unknown result");
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset) 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_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset);
- return recv_searchExperiments();
- }
-
- public void send_searchExperiments(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ExperimentSearchFields,String> filters, int limit, int offset) throws org.apache.thrift.TException
- {
- searchExperiments_args args = new searchExperiments_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setFilters(filters);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperiments", args);
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> recv_searchExperiments() 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
- {
- searchExperiments_result result = new searchExperiments_result();
- receiveBase(result, "searchExperiments");
- 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, "searchExperiments failed: unknown result");
- }
-
- public org.apache.airavata.model.experiment.ExperimentStatistics getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) 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_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime);
- return recv_getExperimentStatistics();
- }
-
- public void send_getExperimentStatistics(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, long fromTime, long toTime) throws org.apache.thrift.TException
- {
- getExperimentStatistics_args args = new getExperimentStatistics_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setFromTime(fromTime);
- args.setToTime(toTime);
- sendBase("getExperimentStatistics", args);
- }
-
- public org.apache.airavata.model.experiment.ExperimentStatistics recv_getExperimentStatistics() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.mode
<TRUNCATED>
[09/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
index 6a01675..b159499 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavata_apiConstants.java
@@ -67,6 +67,6 @@ public class airavata_apiConstants {
* in a change to major/minor version numbers.
*
*/
- public static final String AIRAVATA_API_VERSION = "0.15.0";
+ public static final String AIRAVATA_API_VERSION = "0.16.0";
}
[06/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 49d8154..8f8ff24 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
@@ -164,25 +164,6 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
- * * Get all Project by user
- * *
- * * @param gatewayId
- * * The identifier for the requested gateway.
- * *
- * * @param userName
- * * The Project Object described in the workspace_model
- * * @deprecated Instead use getAllUserProjectsWithPagination
- * *
- *
- * @param gatewayId
- * @param userName
- */
- void getAllUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName) {
- // Your implementation goes here
- printf("getAllUserProjects\n");
- }
-
- /**
* * Get all Project by user with pagination. Results will be ordered based
* * on creation time DESC
* *
@@ -202,29 +183,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void getAllUserProjectsWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) {
- // Your implementation goes here
- printf("getAllUserProjectsWithPagination\n");
- }
-
- /**
- * Get all Project for user by project name
- *
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param projectName
- * The name of the project on which the results to be fetched
- * @deprecated Instead use searchProjectsByProjectNameWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param projectName
- */
- void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName, const std::string& projectName) {
+ void getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchProjectsByProjectName\n");
+ printf("getUserProjects\n");
}
/**
@@ -249,28 +210,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchProjectsByProjectNameWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& projectName, const int32_t limit, const int32_t offset) {
+ void searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& projectName, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchProjectsByProjectNameWithPagination\n");
- }
-
- /**
- * Get all Project for user by project description
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @deprecated Instead use searchProjectsByProjectDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) {
- // Your implementation goes here
- printf("searchProjectsByProjectDesc\n");
+ printf("searchProjectsByProjectName\n");
}
/**
@@ -295,31 +237,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchProjectsByProjectDescWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
+ void searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchProjectsByProjectDescWithPagination\n");
- }
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param useNname
- * Username of the requested user
- * @param expName
- * Experiment name to be matched
- * @deprecated
- * Instead use searchExperimentsByNameWithPagination
- *
- *
- * @param gatewayId
- * @param userName
- * @param expName
- */
- void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) {
- // Your implementation goes here
- printf("searchExperimentsByName\n");
+ printf("searchProjectsByProjectDesc\n");
}
/**
@@ -344,30 +264,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) {
- // Your implementation goes here
- printf("searchExperimentsByNameWithPagination\n");
- }
-
- /**
- * Search Experiments by experiment name
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param description
- * Experiment description to be matched
- * @deprecated
- * Instead use searchExperimentsByDescWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param description
- */
- void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) {
+ void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchExperimentsByDesc\n");
+ printf("searchExperimentsByName\n");
}
/**
@@ -392,30 +291,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchExperimentsByDescWithPagination\n");
- }
-
- /**
- * Search Experiments by application id
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param applicationId
- * Application id to be matched
- * @deprecated
- * Instead use searchExperimentsByApplicationWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param applicationId
- */
- void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) {
- // Your implementation goes here
- printf("searchExperimentsByApplication\n");
+ printf("searchExperimentsByDesc\n");
}
/**
@@ -440,30 +318,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchExperimentsByApplicationWithPagination\n");
- }
-
- /**
- * Search Experiments by experiment status
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param experimentState
- * Experiement state to be matched
- * @deprecated
- * Instead use searchExperimentsByStatusWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param experimentState
- */
- void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState) {
- // Your implementation goes here
- printf("searchExperimentsByStatus\n");
+ printf("searchExperimentsByApplication\n");
}
/**
@@ -488,33 +345,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) {
- // Your implementation goes here
- printf("searchExperimentsByStatusWithPagination\n");
- }
-
- /**
- * Search Experiments by experiment creation time
- *
- * @param gatewayId
- * Identifier of the requested gateway
- * @param userName
- * Username of the requested user
- * @param fromTime
- * Start time of the experiments creation time
- * @param toTime
- * End time of the experiement creation time
- * @deprecated
- * Instead use searchExperimentsByCreationTimeWithPagination
- *
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- */
- void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) {
+ void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchExperimentsByCreationTime\n");
+ printf("searchExperimentsByStatus\n");
}
/**
@@ -542,9 +375,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchExperimentsByCreationTimeWithPagination\n");
+ printf("searchExperimentsByCreationTime\n");
}
/**
@@ -595,22 +428,7 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
- * Get all Experiments within a Project
- *
- * @param projectId
- * Identifier of the project
- * @deprecated
- * Instead use getAllExperimentsInProjectWithPagination
- *
- * @param projectId
- */
- void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId) {
- // Your implementation goes here
- printf("getAllExperimentsInProject\n");
- }
-
- /**
- * Get all Experiments within project with pagination. Results will be sorted
+ * Get Experiments within project with pagination. Results will be sorted
* based on creation time DESC
*
* @param projectId
@@ -625,31 +443,13 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void getAllExperimentsInProjectWithPagination(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) {
- // Your implementation goes here
- printf("getAllExperimentsInProjectWithPagination\n");
- }
-
- /**
- * Get all Experiments by user
- *
- * @param gatewayId
- * Identifier of the requesting gateway
- * @param userName
- * Username of the requested user
- * @deprecated
- * Instead use getAllUserExperimentsWithPagination
- *
- * @param gatewayId
- * @param userName
- */
- void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName) {
+ void 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) {
// Your implementation goes here
- printf("getAllUserExperiments\n");
+ printf("getExperimentsInProject\n");
}
/**
- * Get all Experiments by user pagination. Results will be sorted
+ * Get experiments by user with pagination. Results will be sorted
* based on creation time DESC
*
* @param gatewayId
@@ -667,9 +467,9 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void getAllUserExperimentsWithPagination(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 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) {
// Your implementation goes here
- printf("getAllUserExperimentsWithPagination\n");
+ printf("getUserExperiments\n");
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp
index 408aee2..6a8bf09 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavata_api_constants.cpp
@@ -28,7 +28,7 @@ namespace apache { namespace airavata { namespace api {
const airavata_apiConstants g_airavata_api_constants;
airavata_apiConstants::airavata_apiConstants() {
- AIRAVATA_API_VERSION = "0.15.0";
+ AIRAVATA_API_VERSION = "0.16.0";
}
[08/13] airavata git commit: removing non paginated versions of API
methods for project and experiment retrieval, from Airavata API
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 17cc59c..e1f991b 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
@@ -4070,11 +4070,11 @@ uint32_t Airavata_deleteProject_presult::read(::apache::thrift::protocol::TProto
}
-Airavata_getAllUserProjects_args::~Airavata_getAllUserProjects_args() throw() {
+Airavata_getUserProjects_args::~Airavata_getUserProjects_args() throw() {
}
-uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserProjects_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4085,8 +4085,11 @@ uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TPro
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
+ bool isset_limit = false;
+ bool isset_offset = false;
while (true)
{
@@ -4097,6 +4100,14 @@ uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TPro
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->gatewayId);
isset_gatewayId = true;
@@ -4104,7 +4115,7 @@ uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -4112,6 +4123,22 @@ uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->limit);
+ isset_limit = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->offset);
+ isset_offset = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -4121,26 +4148,44 @@ uint32_t Airavata_getAllUserProjects_args::read(::apache::thrift::protocol::TPro
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_limit)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_offset)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getAllUserProjects_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserProjects_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjects_args");
+ xfer += oprot->writeStructBegin("Airavata_getUserProjects_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32(this->limit);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32(this->offset);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
oprot->decrementRecursionDepth();
@@ -4148,23 +4193,35 @@ uint32_t Airavata_getAllUserProjects_args::write(::apache::thrift::protocol::TPr
}
-Airavata_getAllUserProjects_pargs::~Airavata_getAllUserProjects_pargs() throw() {
+Airavata_getUserProjects_pargs::~Airavata_getUserProjects_pargs() throw() {
}
-uint32_t Airavata_getAllUserProjects_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserProjects_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjects_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getUserProjects_pargs");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((*(this->limit)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32((*(this->offset)));
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
oprot->decrementRecursionDepth();
@@ -4172,11 +4229,11 @@ uint32_t Airavata_getAllUserProjects_pargs::write(::apache::thrift::protocol::TP
}
-Airavata_getAllUserProjects_result::~Airavata_getAllUserProjects_result() throw() {
+Airavata_getUserProjects_result::~Airavata_getUserProjects_result() throw() {
}
-uint32_t Airavata_getAllUserProjects_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserProjects_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4240,6 +4297,14 @@ uint32_t Airavata_getAllUserProjects_result::read(::apache::thrift::protocol::TP
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;
@@ -4252,11 +4317,11 @@ uint32_t Airavata_getAllUserProjects_result::read(::apache::thrift::protocol::TP
return xfer;
}
-uint32_t Airavata_getAllUserProjects_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserProjects_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjects_result");
+ xfer += oprot->writeStructBegin("Airavata_getUserProjects_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
@@ -4282,6 +4347,10 @@ uint32_t Airavata_getAllUserProjects_result::write(::apache::thrift::protocol::T
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();
@@ -4289,11 +4358,11 @@ uint32_t Airavata_getAllUserProjects_result::write(::apache::thrift::protocol::T
}
-Airavata_getAllUserProjects_presult::~Airavata_getAllUserProjects_presult() throw() {
+Airavata_getUserProjects_presult::~Airavata_getUserProjects_presult() throw() {
}
-uint32_t Airavata_getAllUserProjects_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserProjects_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4357,6 +4426,14 @@ uint32_t Airavata_getAllUserProjects_presult::read(::apache::thrift::protocol::T
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;
@@ -4370,11 +4447,11 @@ uint32_t Airavata_getAllUserProjects_presult::read(::apache::thrift::protocol::T
}
-Airavata_getAllUserProjectsWithPagination_args::~Airavata_getAllUserProjectsWithPagination_args() throw() {
+Airavata_searchProjectsByProjectName_args::~Airavata_searchProjectsByProjectName_args() throw() {
}
-uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4388,6 +4465,7 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
+ bool isset_projectName = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -4424,6 +4502,14 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::
}
break;
case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->projectName);
+ isset_projectName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->limit);
isset_limit = true;
@@ -4431,7 +4517,7 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->offset);
isset_offset = true;
@@ -4454,6 +4540,8 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_projectName)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_offset)
@@ -4461,10 +4549,10 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::read(::apache::thrift::
return xfer;
}
-uint32_t Airavata_getAllUserProjectsWithPagination_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjectsWithPagination_args");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -4478,11 +4566,15 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::write(::apache::thrift:
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->projectName);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
xfer += oprot->writeI32(this->limit);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
@@ -4493,14 +4585,14 @@ uint32_t Airavata_getAllUserProjectsWithPagination_args::write(::apache::thrift:
}
-Airavata_getAllUserProjectsWithPagination_pargs::~Airavata_getAllUserProjectsWithPagination_pargs() throw() {
+Airavata_searchProjectsByProjectName_pargs::~Airavata_searchProjectsByProjectName_pargs() throw() {
}
-uint32_t Airavata_getAllUserProjectsWithPagination_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjectsWithPagination_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -4514,11 +4606,15 @@ uint32_t Airavata_getAllUserProjectsWithPagination_pargs::write(::apache::thrift
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString((*(this->projectName)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
xfer += oprot->writeI32((*(this->limit)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
@@ -4529,11 +4625,11 @@ uint32_t Airavata_getAllUserProjectsWithPagination_pargs::write(::apache::thrift
}
-Airavata_getAllUserProjectsWithPagination_result::~Airavata_getAllUserProjectsWithPagination_result() throw() {
+Airavata_searchProjectsByProjectName_result::~Airavata_searchProjectsByProjectName_result() throw() {
}
-uint32_t Airavata_getAllUserProjectsWithPagination_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4617,11 +4713,11 @@ uint32_t Airavata_getAllUserProjectsWithPagination_result::read(::apache::thrift
return xfer;
}
-uint32_t Airavata_getAllUserProjectsWithPagination_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getAllUserProjectsWithPagination_result");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
@@ -4658,11 +4754,11 @@ uint32_t Airavata_getAllUserProjectsWithPagination_result::write(::apache::thrif
}
-Airavata_getAllUserProjectsWithPagination_presult::~Airavata_getAllUserProjectsWithPagination_presult() throw() {
+Airavata_searchProjectsByProjectName_presult::~Airavata_searchProjectsByProjectName_presult() throw() {
}
-uint32_t Airavata_getAllUserProjectsWithPagination_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4747,11 +4843,11 @@ uint32_t Airavata_getAllUserProjectsWithPagination_presult::read(::apache::thrif
}
-Airavata_searchProjectsByProjectName_args::~Airavata_searchProjectsByProjectName_args() throw() {
+Airavata_searchProjectsByProjectDesc_args::~Airavata_searchProjectsByProjectDesc_args() throw() {
}
-uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4762,9 +4858,12 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_projectName = false;
+ bool isset_description = false;
+ bool isset_limit = false;
+ bool isset_offset = false;
while (true)
{
@@ -4775,6 +4874,14 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
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->gatewayId);
isset_gatewayId = true;
@@ -4782,7 +4889,7 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -4790,10 +4897,26 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->projectName);
- isset_projectName = true;
+ xfer += iprot->readString(this->description);
+ isset_description = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->limit);
+ isset_limit = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->offset);
+ isset_offset = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -4807,30 +4930,48 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_projectName)
+ if (!isset_description)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_limit)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_offset)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_args");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->projectName);
+ xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->description);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32(this->limit);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -4840,25 +4981,37 @@ uint32_t Airavata_searchProjectsByProjectName_args::write(::apache::thrift::prot
}
-Airavata_searchProjectsByProjectName_pargs::~Airavata_searchProjectsByProjectName_pargs() throw() {
+Airavata_searchProjectsByProjectDesc_pargs::~Airavata_searchProjectsByProjectDesc_pargs() throw() {
}
-uint32_t Airavata_searchProjectsByProjectName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_pargs");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->projectName)));
+ xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString((*(this->description)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32((*(this->limit)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -4868,11 +5021,11 @@ uint32_t Airavata_searchProjectsByProjectName_pargs::write(::apache::thrift::pro
}
-Airavata_searchProjectsByProjectName_result::~Airavata_searchProjectsByProjectName_result() throw() {
+Airavata_searchProjectsByProjectDesc_result::~Airavata_searchProjectsByProjectDesc_result() throw() {
}
-uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -4936,6 +5089,14 @@ uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::pro
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;
@@ -4948,11 +5109,11 @@ uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_result");
+ xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
@@ -4978,6 +5139,10 @@ uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::pr
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();
@@ -4985,11 +5150,11 @@ uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::pr
}
-Airavata_searchProjectsByProjectName_presult::~Airavata_searchProjectsByProjectName_presult() throw() {
+Airavata_searchProjectsByProjectDesc_presult::~Airavata_searchProjectsByProjectDesc_presult() throw() {
}
-uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5053,6 +5218,14 @@ uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::pr
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;
@@ -5066,11 +5239,11 @@ uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::pr
}
-Airavata_searchProjectsByProjectNameWithPagination_args::~Airavata_searchProjectsByProjectNameWithPagination_args() throw() {
+Airavata_searchExperimentsByName_args::~Airavata_searchExperimentsByName_args() throw() {
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5084,7 +5257,7 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::read(::apache:
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_projectName = false;
+ bool isset_expName = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -5122,8 +5295,8 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::read(::apache:
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->projectName);
- isset_projectName = true;
+ xfer += iprot->readString(this->expName);
+ isset_expName = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -5159,7 +5332,7 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::read(::apache:
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_projectName)
+ if (!isset_expName)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -5168,10 +5341,10 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::read(::apache:
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectNameWithPagination_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -5185,8 +5358,8 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::write(::apache
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->projectName);
+ xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->expName);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -5204,14 +5377,14 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_args::write(::apache
}
-Airavata_searchProjectsByProjectNameWithPagination_pargs::~Airavata_searchProjectsByProjectNameWithPagination_pargs() throw() {
+Airavata_searchExperimentsByName_pargs::~Airavata_searchExperimentsByName_pargs() throw() {
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectNameWithPagination_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -5225,8 +5398,8 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_pargs::write(::apach
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectName", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->projectName)));
+ xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString((*(this->expName)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -5244,11 +5417,11 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_pargs::write(::apach
}
-Airavata_searchProjectsByProjectNameWithPagination_result::~Airavata_searchProjectsByProjectNameWithPagination_result() throw() {
+Airavata_searchExperimentsByName_result::~Airavata_searchExperimentsByName_result() throw() {
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5332,17 +5505,17 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_result::read(::apach
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectNameWithPagination_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter64;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter64;
for (_iter64 = this->success.begin(); _iter64 != this->success.end(); ++_iter64)
{
xfer += (*_iter64).write(oprot);
@@ -5373,11 +5546,11 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_result::write(::apac
}
-Airavata_searchProjectsByProjectNameWithPagination_presult::~Airavata_searchProjectsByProjectNameWithPagination_presult() throw() {
+Airavata_searchExperimentsByName_presult::~Airavata_searchExperimentsByName_presult() throw() {
}
-uint32_t Airavata_searchProjectsByProjectNameWithPagination_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5462,11 +5635,11 @@ uint32_t Airavata_searchProjectsByProjectNameWithPagination_presult::read(::apac
}
-Airavata_searchProjectsByProjectDesc_args::~Airavata_searchProjectsByProjectDesc_args() throw() {
+Airavata_searchExperimentsByDesc_args::~Airavata_searchExperimentsByDesc_args() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5477,9 +5650,12 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
bool isset_description = false;
+ bool isset_limit = false;
+ bool isset_offset = false;
while (true)
{
@@ -5490,6 +5666,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
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->gatewayId);
isset_gatewayId = true;
@@ -5497,7 +5681,7 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -5505,7 +5689,7 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->description);
isset_description = true;
@@ -5513,6 +5697,22 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
xfer += iprot->skip(ftype);
}
break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->limit);
+ isset_limit = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->offset);
+ isset_offset = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -5522,32 +5722,50 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_description)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_limit)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_offset)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->description);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32(this->limit);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32(this->offset);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
oprot->decrementRecursionDepth();
@@ -5555,27 +5773,39 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::prot
}
-Airavata_searchProjectsByProjectDesc_pargs::~Airavata_searchProjectsByProjectDesc_pargs() throw() {
+Airavata_searchExperimentsByDesc_pargs::~Airavata_searchExperimentsByDesc_pargs() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_pargs");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString((*(this->description)));
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32((*(this->limit)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32((*(this->offset)));
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
oprot->decrementRecursionDepth();
@@ -5583,11 +5813,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::pro
}
-Airavata_searchProjectsByProjectDesc_result::~Airavata_searchProjectsByProjectDesc_result() throw() {
+Airavata_searchExperimentsByDesc_result::~Airavata_searchExperimentsByDesc_result() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5651,6 +5881,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::pro
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;
@@ -5663,17 +5901,17 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter75;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter75;
for (_iter75 = this->success.begin(); _iter75 != this->success.end(); ++_iter75)
{
xfer += (*_iter75).write(oprot);
@@ -5693,6 +5931,10 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::pr
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();
@@ -5700,11 +5942,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::pr
}
-Airavata_searchProjectsByProjectDesc_presult::~Airavata_searchProjectsByProjectDesc_presult() throw() {
+Airavata_searchExperimentsByDesc_presult::~Airavata_searchExperimentsByDesc_presult() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByDesc_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5768,6 +6010,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::pr
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;
@@ -5781,11 +6031,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::pr
}
-Airavata_searchProjectsByProjectDescWithPagination_args::~Airavata_searchProjectsByProjectDescWithPagination_args() throw() {
+Airavata_searchExperimentsByApplication_args::~Airavata_searchExperimentsByApplication_args() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -5799,7 +6049,7 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::read(::apache:
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_description = false;
+ bool isset_applicationId = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -5837,8 +6087,8 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::read(::apache:
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->description);
- isset_description = true;
+ xfer += iprot->readString(this->applicationId);
+ isset_applicationId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -5874,7 +6124,7 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::read(::apache:
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_description)
+ if (!isset_applicationId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -5883,10 +6133,10 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::read(::apache:
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByApplication_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDescWithPagination_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -5900,8 +6150,8 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::write(::apache
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->description);
+ xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->applicationId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -5919,14 +6169,14 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_args::write(::apache
}
-Airavata_searchProjectsByProjectDescWithPagination_pargs::~Airavata_searchProjectsByProjectDescWithPagination_pargs() throw() {
+Airavata_searchExperimentsByApplication_pargs::~Airavata_searchExperimentsByApplication_pargs() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByApplication_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDescWithPagination_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -5940,8 +6190,8 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_pargs::write(::apach
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->description)));
+ xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString((*(this->applicationId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -5959,11 +6209,11 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_pargs::write(::apach
}
-Airavata_searchProjectsByProjectDescWithPagination_result::~Airavata_searchProjectsByProjectDescWithPagination_result() throw() {
+Airavata_searchExperimentsByApplication_result::~Airavata_searchExperimentsByApplication_result() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6047,17 +6297,17 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_result::read(::apach
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDescWithPagination_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter86;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter86;
for (_iter86 = this->success.begin(); _iter86 != this->success.end(); ++_iter86)
{
xfer += (*_iter86).write(oprot);
@@ -6088,11 +6338,11 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_result::write(::apac
}
-Airavata_searchProjectsByProjectDescWithPagination_presult::~Airavata_searchProjectsByProjectDescWithPagination_presult() throw() {
+Airavata_searchExperimentsByApplication_presult::~Airavata_searchExperimentsByApplication_presult() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDescWithPagination_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6177,11 +6427,11 @@ uint32_t Airavata_searchProjectsByProjectDescWithPagination_presult::read(::apac
}
-Airavata_searchExperimentsByName_args::~Airavata_searchExperimentsByName_args() throw() {
+Airavata_searchExperimentsByStatus_args::~Airavata_searchExperimentsByStatus_args() throw() {
}
-uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6192,9 +6442,12 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_expName = false;
+ bool isset_experimentState = false;
+ bool isset_limit = false;
+ bool isset_offset = false;
while (true)
{
@@ -6205,6 +6458,14 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
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->gatewayId);
isset_gatewayId = true;
@@ -6212,7 +6473,7 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -6220,10 +6481,28 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->expName);
- isset_expName = true;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast92;
+ xfer += iprot->readI32(ecast92);
+ this->experimentState = ( ::apache::airavata::model::status::ExperimentState::type)ecast92;
+ isset_experimentState = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->limit);
+ isset_limit = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->offset);
+ isset_offset = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -6237,30 +6516,48 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_expName)
+ if (!isset_experimentState)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_limit)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_offset)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByStatus_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->expName);
+ xfer += oprot->writeFieldBegin("experimentState", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)this->experimentState);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32(this->limit);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -6270,25 +6567,37 @@ uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol
}
-Airavata_searchExperimentsByName_pargs::~Airavata_searchExperimentsByName_pargs() throw() {
+Airavata_searchExperimentsByStatus_pargs::~Airavata_searchExperimentsByStatus_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByStatus_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_pargs");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->expName)));
+ xfer += oprot->writeFieldBegin("experimentState", ::apache::thrift::protocol::T_I32, 4);
+ xfer += oprot->writeI32((int32_t)(*(this->experimentState)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32((*(this->limit)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -6298,11 +6607,11 @@ uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protoco
}
-Airavata_searchExperimentsByName_result::~Airavata_searchExperimentsByName_result() throw() {
+Airavata_searchExperimentsByStatus_result::~Airavata_searchExperimentsByStatus_result() throw() {
}
-uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByStatus_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6326,14 +6635,14 @@ uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size92;
- ::apache::thrift::protocol::TType _etype95;
- xfer += iprot->readListBegin(_etype95, _size92);
- this->success.resize(_size92);
- uint32_t _i96;
- for (_i96 = 0; _i96 < _size92; ++_i96)
+ uint32_t _size93;
+ ::apache::thrift::protocol::TType _etype96;
+ xfer += iprot->readListBegin(_etype96, _size93);
+ this->success.resize(_size93);
+ uint32_t _i97;
+ for (_i97 = 0; _i97 < _size93; ++_i97)
{
- xfer += this->success[_i96].read(iprot);
+ xfer += this->success[_i97].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -6366,6 +6675,14 @@ uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protoco
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;
@@ -6378,20 +6695,20 @@ uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByStatus_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter97;
- for (_iter97 = this->success.begin(); _iter97 != this->success.end(); ++_iter97)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter98;
+ for (_iter98 = this->success.begin(); _iter98 != this->success.end(); ++_iter98)
{
- xfer += (*_iter97).write(oprot);
+ xfer += (*_iter98).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -6408,6 +6725,10 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
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();
@@ -6415,11 +6736,11 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
}
-Airavata_searchExperimentsByName_presult::~Airavata_searchExperimentsByName_presult() throw() {
+Airavata_searchExperimentsByStatus_presult::~Airavata_searchExperimentsByStatus_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByStatus_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6443,14 +6764,14 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size98;
- ::apache::thrift::protocol::TType _etype101;
- xfer += iprot->readListBegin(_etype101, _size98);
- (*(this->success)).resize(_size98);
- uint32_t _i102;
- for (_i102 = 0; _i102 < _size98; ++_i102)
+ uint32_t _size99;
+ ::apache::thrift::protocol::TType _etype102;
+ xfer += iprot->readListBegin(_etype102, _size99);
+ (*(this->success)).resize(_size99);
+ uint32_t _i103;
+ for (_i103 = 0; _i103 < _size99; ++_i103)
{
- xfer += (*(this->success))[_i102].read(iprot);
+ xfer += (*(this->success))[_i103].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -6483,6 +6804,14 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
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;
@@ -6496,11 +6825,11 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
}
-Airavata_searchExperimentsByNameWithPagination_args::~Airavata_searchExperimentsByNameWithPagination_args() throw() {
+Airavata_searchExperimentsByCreationTime_args::~Airavata_searchExperimentsByCreationTime_args() throw() {
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByCreationTime_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6514,7 +6843,8 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thr
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_expName = false;
+ bool isset_fromTime = false;
+ bool isset_toTime = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -6551,14 +6881,22 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thr
}
break;
case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->expName);
- isset_expName = true;
+ if (ftype == ::apache::thrift::protocol::T_I64) {
+ xfer += iprot->readI64(this->fromTime);
+ isset_fromTime = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 5:
+ if (ftype == ::apache::thrift::protocol::T_I64) {
+ xfer += iprot->readI64(this->toTime);
+ isset_toTime = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->limit);
isset_limit = true;
@@ -6566,7 +6904,7 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thr
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->offset);
isset_offset = true;
@@ -6589,7 +6927,9 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thr
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_expName)
+ if (!isset_fromTime)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_toTime)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -6598,10 +6938,10 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::read(::apache::thr
return xfer;
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByCreationTime_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByNameWithPagination_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -6615,15 +6955,19 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::write(::apache::th
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->expName);
+ xfer += oprot->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 4);
+ xfer += oprot->writeI64(this->fromTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 5);
+ xfer += oprot->writeI64(this->toTime);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 6);
xfer += oprot->writeI32(this->limit);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 7);
xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
@@ -6634,14 +6978,14 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_args::write(::apache::th
}
-Airavata_searchExperimentsByNameWithPagination_pargs::~Airavata_searchExperimentsByNameWithPagination_pargs() throw() {
+Airavata_searchExperimentsByCreationTime_pargs::~Airavata_searchExperimentsByCreationTime_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByCreationTime_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByNameWithPagination_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -6655,15 +6999,19 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_pargs::write(::apache::t
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("expName", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->expName)));
+ xfer += oprot->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 4);
+ xfer += oprot->writeI64((*(this->fromTime)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 5);
+ xfer += oprot->writeI64((*(this->toTime)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 6);
xfer += oprot->writeI32((*(this->limit)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 7);
xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
@@ -6674,11 +7022,11 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_pargs::write(::apache::t
}
-Airavata_searchExperimentsByNameWithPagination_result::~Airavata_searchExperimentsByNameWithPagination_result() throw() {
+Airavata_searchExperimentsByCreationTime_result::~Airavata_searchExperimentsByCreationTime_result() throw() {
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByCreationTime_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6702,14 +7050,14 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_result::read(::apache::t
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size103;
- ::apache::thrift::protocol::TType _etype106;
- xfer += iprot->readListBegin(_etype106, _size103);
- this->success.resize(_size103);
- uint32_t _i107;
- for (_i107 = 0; _i107 < _size103; ++_i107)
+ uint32_t _size104;
+ ::apache::thrift::protocol::TType _etype107;
+ xfer += iprot->readListBegin(_etype107, _size104);
+ this->success.resize(_size104);
+ uint32_t _i108;
+ for (_i108 = 0; _i108 < _size104; ++_i108)
{
- xfer += this->success[_i107].read(iprot);
+ xfer += this->success[_i108].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -6762,20 +7110,20 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_result::read(::apache::t
return xfer;
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperimentsByCreationTime_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByNameWithPagination_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter108;
- for (_iter108 = this->success.begin(); _iter108 != this->success.end(); ++_iter108)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter109;
+ for (_iter109 = this->success.begin(); _iter109 != this->success.end(); ++_iter109)
{
- xfer += (*_iter108).write(oprot);
+ xfer += (*_iter109).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -6803,11 +7151,11 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_result::write(::apache::
}
-Airavata_searchExperimentsByNameWithPagination_presult::~Airavata_searchExperimentsByNameWithPagination_presult() throw() {
+Airavata_searchExperimentsByCreationTime_presult::~Airavata_searchExperimentsByCreationTime_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByNameWithPagination_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperimentsByCreationTime_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6831,14 +7179,14 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_presult::read(::apache::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size109;
- ::apache::thrift::protocol::TType _etype112;
- xfer += iprot->readListBegin(_etype112, _size109);
- (*(this->success)).resize(_size109);
- uint32_t _i113;
- for (_i113 = 0; _i113 < _size109; ++_i113)
+ uint32_t _size110;
+ ::apache::thrift::protocol::TType _etype113;
+ xfer += iprot->readListBegin(_etype113, _size110);
+ (*(this->success)).resize(_size110);
+ uint32_t _i114;
+ for (_i114 = 0; _i114 < _size110; ++_i114)
{
- xfer += (*(this->success))[_i113].read(iprot);
+ xfer += (*(this->success))[_i114].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -6892,11 +7240,11 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_presult::read(::apache::
}
-Airavata_searchExperimentsByDesc_args::~Airavata_searchExperimentsByDesc_args() throw() {
+Airavata_searchExperiments_args::~Airavata_searchExperiments_args() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -6907,9 +7255,11 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_description = false;
+ bool isset_limit = false;
+ bool isset_offset = false;
while (true)
{
@@ -6920,6 +7270,14 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
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->gatewayId);
isset_gatewayId = true;
@@ -6927,7 +7285,7 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
isset_userName = true;
@@ -6935,10 +7293,43 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->description);
- isset_description = true;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->filters.clear();
+ uint32_t _size115;
+ ::apache::thrift::protocol::TType _ktype116;
+ ::apache::thrift::protocol::TType _vtype117;
+ xfer += iprot->readMapBegin(_ktype116, _vtype117, _size115);
+ uint32_t _i119;
+ for (_i119 = 0; _i119 < _size115; ++_i119)
+ {
+ ::apache::airavata::model::experiment::ExperimentSearchFields::type _key120;
+ int32_t ecast122;
+ xfer += iprot->readI32(ecast122);
+ _key120 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast122;
+ std::string& _val121 = this->filters[_key120];
+ xfer += iprot->readString(_val121);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.filters = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->limit);
+ isset_limit = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->offset);
+ isset_offset = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -6952,58 +7343,55 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
xfer += iprot->readStructEnd();
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_description)
+ if (!isset_limit)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_offset)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchExperimentsByDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperiments_args");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->gatewayId);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->authzToken.write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userName);
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->description);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- oprot->decrementRecursionDepth();
- return xfer;
-}
-
-
-Airavata_searchExperimentsByDesc_pargs::~Airavata_searchExperimentsByDesc_pargs() throw() {
-}
-
-
-uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_pargs");
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->gatewayId)));
+ xfer += oprot->writeFieldBegin("filters", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->filters.size()));
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter123;
+ for (_iter123 = this->filters.begin(); _iter123 != this->filters.end(); ++_iter123)
+ {
+ xfer += oprot->writeI32((int32_t)_iter123->first);
+ xfer += oprot->writeString(_iter123->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userName)));
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeI32(this->limit);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("description", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->description)));
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
+ xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -7013,128 +7401,60 @@ uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protoco
}
-Airavata_searchExperimentsByDesc_result::~Airavata_searchExperimentsByDesc_result() throw() {
+Airavata_searchExperiments_pargs::~Airavata_searchExperiments_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
+uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
+ oprot->incrementRecursionDepth();
+ xfer += oprot->writeStructBegin("Airavata_searchExperiments_pargs");
- xfer += iprot->readStructBegin(fname);
+ xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->authzToken)).write(oprot);
+ xfer += oprot->writeFieldEnd();
- using ::apache::thrift::protocol::TProtocolException;
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->gatewayId)));
+ xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString((*(this->userName)));
+ xfer += oprot->writeFieldEnd();
- while (true)
+ xfer += oprot->writeFieldBegin("filters", ::apache::thrift::protocol::T_MAP, 4);
{
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->filters)).size()));
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter124;
+ for (_iter124 = (*(this->filters)).begin(); _iter124 != (*(this->filters)).end(); ++_iter124)
{
- case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size114;
- ::apache::thrift::protocol::TType _etype117;
- xfer += iprot->readListBegin(_etype117, _size114);
- this->success.resize(_size114);
- uint32_t _i118;
- for (_i118 = 0; _i118 < _size114; ++_i118)
- {
- xfer += this->success[_i118].read(ipro
<TRUNCATED>
[12/13] airavata git commit: adding Authz token as a parameter for
Airavata credential store API methods
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 38e6e6a..0928ada 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
@@ -103,6 +103,7 @@ interface AiravataIf {
*
*
*
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
* @return string
@@ -110,23 +111,25 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
*/
- public function generateAndRegisterSSHKeys($gatewayId, $userName);
+ public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName);
/**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataCredStoreToken
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
*/
- public function getSSHPubKey($airavataCredStoreToken);
+ public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken);
/**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $userName
* @return array
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
*/
- public function getAllUserSSHPubKeys($userName);
+ public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName);
/**
* Creates a Project with basic metadata.
* A Project is a container of experiments.
@@ -2967,15 +2970,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isGatewayExist failed: unknown result");
}
- public function generateAndRegisterSSHKeys($gatewayId, $userName)
+ public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName)
{
- $this->send_generateAndRegisterSSHKeys($gatewayId, $userName);
+ $this->send_generateAndRegisterSSHKeys($authzToken, $gatewayId, $userName);
return $this->recv_generateAndRegisterSSHKeys();
}
- public function send_generateAndRegisterSSHKeys($gatewayId, $userName)
+ public function send_generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName)
{
$args = new \Airavata\API\Airavata_generateAndRegisterSSHKeys_args();
+ $args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -3028,15 +3032,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("generateAndRegisterSSHKeys failed: unknown result");
}
- public function getSSHPubKey($airavataCredStoreToken)
+ public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
{
- $this->send_getSSHPubKey($airavataCredStoreToken);
+ $this->send_getSSHPubKey($authzToken, $airavataCredStoreToken);
return $this->recv_getSSHPubKey();
}
- public function send_getSSHPubKey($airavataCredStoreToken)
+ public function send_getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken)
{
$args = new \Airavata\API\Airavata_getSSHPubKey_args();
+ $args->authzToken = $authzToken;
$args->airavataCredStoreToken = $airavataCredStoreToken;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -3088,15 +3093,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSSHPubKey failed: unknown result");
}
- public function getAllUserSSHPubKeys($userName)
+ public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
- $this->send_getAllUserSSHPubKeys($userName);
+ $this->send_getAllUserSSHPubKeys($authzToken, $userName);
return $this->recv_getAllUserSSHPubKeys();
}
- public function send_getAllUserSSHPubKeys($userName)
+ public function send_getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
$args = new \Airavata\API\Airavata_getAllUserSSHPubKeys_args();
+ $args->authzToken = $authzToken;
$args->userName = $userName;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -12046,6 +12052,10 @@ class Airavata_generateAndRegisterSSHKeys_args {
static $_TSPEC;
/**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
* @var string
*/
public $gatewayId = null;
@@ -12058,16 +12068,24 @@ class Airavata_generateAndRegisterSSHKeys_args {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 2 => array(
+ 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'];
}
@@ -12097,13 +12115,21 @@ class Airavata_generateAndRegisterSSHKeys_args {
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;
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 2:
+ case 3:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userName);
} else {
@@ -12123,13 +12149,21 @@ class Airavata_generateAndRegisterSSHKeys_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_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();
+ }
if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 1);
+ $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, 2);
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
@@ -12294,6 +12328,10 @@ class Airavata_getSSHPubKey_args {
static $_TSPEC;
/**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
* @var string
*/
public $airavataCredStoreToken = null;
@@ -12302,12 +12340,20 @@ class Airavata_getSSHPubKey_args {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
'var' => 'airavataCredStoreToken',
'type' => TType::STRING,
),
);
}
if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
if (isset($vals['airavataCredStoreToken'])) {
$this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
}
@@ -12334,6 +12380,14 @@ class Airavata_getSSHPubKey_args {
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;
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->airavataCredStoreToken);
} else {
@@ -12353,8 +12407,16 @@ class Airavata_getSSHPubKey_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_getSSHPubKey_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();
+ }
if ($this->airavataCredStoreToken !== null) {
- $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 1);
+ $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 2);
$xfer += $output->writeString($this->airavataCredStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -12519,6 +12581,10 @@ class Airavata_getAllUserSSHPubKeys_args {
static $_TSPEC;
/**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
* @var string
*/
public $userName = null;
@@ -12527,12 +12593,20 @@ class Airavata_getAllUserSSHPubKeys_args {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
'var' => 'userName',
'type' => TType::STRING,
),
);
}
if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
@@ -12559,6 +12633,14 @@ class Airavata_getAllUserSSHPubKeys_args {
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;
+ case 2:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userName);
} else {
@@ -12578,8 +12660,16 @@ class Airavata_getAllUserSSHPubKeys_args {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_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();
+ }
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();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 99b3ee1..470ca44 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
@@ -31,9 +31,9 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool deleteGateway(AuthzToken authzToken, string gatewayId)')
print(' getAllGateways(AuthzToken authzToken)')
print(' bool isGatewayExist(AuthzToken authzToken, string gatewayId)')
- print(' string generateAndRegisterSSHKeys(string gatewayId, string userName)')
- print(' string getSSHPubKey(string airavataCredStoreToken)')
- print(' getAllUserSSHPubKeys(string userName)')
+ print(' string generateAndRegisterSSHKeys(AuthzToken authzToken, string gatewayId, string userName)')
+ print(' string getSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken)')
+ print(' getAllUserSSHPubKeys(AuthzToken authzToken, string userName)')
print(' string createProject(AuthzToken authzToken, string gatewayId, Project project)')
print(' void updateProject(AuthzToken authzToken, string projectId, Project updatedProject)')
print(' Project getProject(AuthzToken authzToken, string projectId)')
@@ -240,22 +240,22 @@ elif cmd == 'isGatewayExist':
pp.pprint(client.isGatewayExist(eval(args[0]),args[1],))
elif cmd == 'generateAndRegisterSSHKeys':
- if len(args) != 2:
- print('generateAndRegisterSSHKeys requires 2 args')
+ if len(args) != 3:
+ print('generateAndRegisterSSHKeys requires 3 args')
sys.exit(1)
- pp.pprint(client.generateAndRegisterSSHKeys(args[0],args[1],))
+ pp.pprint(client.generateAndRegisterSSHKeys(eval(args[0]),args[1],args[2],))
elif cmd == 'getSSHPubKey':
- if len(args) != 1:
- print('getSSHPubKey requires 1 args')
+ if len(args) != 2:
+ print('getSSHPubKey requires 2 args')
sys.exit(1)
- pp.pprint(client.getSSHPubKey(args[0],))
+ pp.pprint(client.getSSHPubKey(eval(args[0]),args[1],))
elif cmd == 'getAllUserSSHPubKeys':
- if len(args) != 1:
- print('getAllUserSSHPubKeys requires 1 args')
+ if len(args) != 2:
+ print('getAllUserSSHPubKeys requires 2 args')
sys.exit(1)
- pp.pprint(client.getAllUserSSHPubKeys(args[0],))
+ pp.pprint(client.getAllUserSSHPubKeys(eval(args[0]),args[1],))
elif cmd == 'createProject':
if len(args) != 3:
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/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 d4de996..f3c5799 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
@@ -75,7 +75,7 @@ class Iface:
"""
pass
- def generateAndRegisterSSHKeys(self, gatewayId, userName):
+ def generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName):
"""
Generate and Register SSH Key Pair with Airavata Credential Store.
@@ -93,21 +93,24 @@ class Iface:
Parameters:
+ - authzToken
- gatewayId
- userName
"""
pass
- def getSSHPubKey(self, airavataCredStoreToken):
+ def getSSHPubKey(self, authzToken, airavataCredStoreToken):
"""
Parameters:
+ - authzToken
- airavataCredStoreToken
"""
pass
- def getAllUserSSHPubKeys(self, userName):
+ def getAllUserSSHPubKeys(self, authzToken, userName):
"""
Parameters:
+ - authzToken
- userName
"""
pass
@@ -2373,7 +2376,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "isGatewayExist failed: unknown result");
- def generateAndRegisterSSHKeys(self, gatewayId, userName):
+ def generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName):
"""
Generate and Register SSH Key Pair with Airavata Credential Store.
@@ -2391,15 +2394,17 @@ class Client(Iface):
Parameters:
+ - authzToken
- gatewayId
- userName
"""
- self.send_generateAndRegisterSSHKeys(gatewayId, userName)
+ self.send_generateAndRegisterSSHKeys(authzToken, gatewayId, userName)
return self.recv_generateAndRegisterSSHKeys()
- def send_generateAndRegisterSSHKeys(self, gatewayId, userName):
+ def send_generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName):
self._oprot.writeMessageBegin('generateAndRegisterSSHKeys', TMessageType.CALL, self._seqid)
args = generateAndRegisterSSHKeys_args()
+ args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
args.write(self._oprot)
@@ -2427,17 +2432,19 @@ class Client(Iface):
raise result.ase
raise TApplicationException(TApplicationException.MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result");
- def getSSHPubKey(self, airavataCredStoreToken):
+ def getSSHPubKey(self, authzToken, airavataCredStoreToken):
"""
Parameters:
+ - authzToken
- airavataCredStoreToken
"""
- self.send_getSSHPubKey(airavataCredStoreToken)
+ self.send_getSSHPubKey(authzToken, airavataCredStoreToken)
return self.recv_getSSHPubKey()
- def send_getSSHPubKey(self, airavataCredStoreToken):
+ def send_getSSHPubKey(self, authzToken, airavataCredStoreToken):
self._oprot.writeMessageBegin('getSSHPubKey', TMessageType.CALL, self._seqid)
args = getSSHPubKey_args()
+ args.authzToken = authzToken
args.airavataCredStoreToken = airavataCredStoreToken
args.write(self._oprot)
self._oprot.writeMessageEnd()
@@ -2464,17 +2471,19 @@ class Client(Iface):
raise result.ase
raise TApplicationException(TApplicationException.MISSING_RESULT, "getSSHPubKey failed: unknown result");
- def getAllUserSSHPubKeys(self, userName):
+ def getAllUserSSHPubKeys(self, authzToken, userName):
"""
Parameters:
+ - authzToken
- userName
"""
- self.send_getAllUserSSHPubKeys(userName)
+ self.send_getAllUserSSHPubKeys(authzToken, userName)
return self.recv_getAllUserSSHPubKeys()
- def send_getAllUserSSHPubKeys(self, userName):
+ def send_getAllUserSSHPubKeys(self, authzToken, userName):
self._oprot.writeMessageBegin('getAllUserSSHPubKeys', TMessageType.CALL, self._seqid)
args = getAllUserSSHPubKeys_args()
+ args.authzToken = authzToken
args.userName = userName
args.write(self._oprot)
self._oprot.writeMessageEnd()
@@ -8382,7 +8391,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = generateAndRegisterSSHKeys_result()
try:
- result.success = self._handler.generateAndRegisterSSHKeys(args.gatewayId, args.userName)
+ result.success = self._handler.generateAndRegisterSSHKeys(args.authzToken, args.gatewayId, args.userName)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -8400,7 +8409,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = getSSHPubKey_result()
try:
- result.success = self._handler.getSSHPubKey(args.airavataCredStoreToken)
+ result.success = self._handler.getSSHPubKey(args.authzToken, args.airavataCredStoreToken)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -8418,7 +8427,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = getAllUserSSHPubKeys_result()
try:
- result.success = self._handler.getAllUserSSHPubKeys(args.userName)
+ result.success = self._handler.getAllUserSSHPubKeys(args.authzToken, args.userName)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -12000,17 +12009,20 @@ class isGatewayExist_result:
class generateAndRegisterSSHKeys_args:
"""
Attributes:
+ - authzToken
- gatewayId
- userName
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'gatewayId', None, None, ), # 2
+ (3, TType.STRING, 'userName', None, None, ), # 3
)
- def __init__(self, gatewayId=None, userName=None,):
+ def __init__(self, authzToken=None, gatewayId=None, userName=None,):
+ self.authzToken = authzToken
self.gatewayId = gatewayId
self.userName = userName
@@ -12024,11 +12036,17 @@ class generateAndRegisterSSHKeys_args:
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.gatewayId = iprot.readString();
else:
iprot.skip(ftype)
- elif fid == 2:
+ elif fid == 3:
if ftype == TType.STRING:
self.userName = iprot.readString();
else:
@@ -12043,18 +12061,24 @@ class generateAndRegisterSSHKeys_args:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('generateAndRegisterSSHKeys_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
+ oprot.writeFieldBegin('userName', TType.STRING, 3)
oprot.writeString(self.userName)
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.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.userName is None:
@@ -12064,6 +12088,7 @@ class generateAndRegisterSSHKeys_args:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.userName)
return value
@@ -12188,15 +12213,18 @@ class generateAndRegisterSSHKeys_result:
class getSSHPubKey_args:
"""
Attributes:
+ - authzToken
- airavataCredStoreToken
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'airavataCredStoreToken', None, None, ), # 1
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'airavataCredStoreToken', None, None, ), # 2
)
- def __init__(self, airavataCredStoreToken=None,):
+ def __init__(self, authzToken=None, airavataCredStoreToken=None,):
+ self.authzToken = authzToken
self.airavataCredStoreToken = airavataCredStoreToken
def read(self, iprot):
@@ -12209,6 +12237,12 @@ class getSSHPubKey_args:
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.airavataCredStoreToken = iprot.readString();
else:
@@ -12223,14 +12257,20 @@ class getSSHPubKey_args:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('getSSHPubKey_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
if self.airavataCredStoreToken is not None:
- oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 1)
+ oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
oprot.writeString(self.airavataCredStoreToken)
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.airavataCredStoreToken is None:
raise TProtocol.TProtocolException(message='Required field airavataCredStoreToken is unset!')
return
@@ -12238,6 +12278,7 @@ class getSSHPubKey_args:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataCredStoreToken)
return value
@@ -12361,15 +12402,18 @@ class getSSHPubKey_result:
class getAllUserSSHPubKeys_args:
"""
Attributes:
+ - authzToken
- userName
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'userName', None, None, ), # 1
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'userName', None, None, ), # 2
)
- def __init__(self, userName=None,):
+ def __init__(self, authzToken=None, userName=None,):
+ self.authzToken = authzToken
self.userName = userName
def read(self, iprot):
@@ -12382,6 +12426,12 @@ class getAllUserSSHPubKeys_args:
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.userName = iprot.readString();
else:
@@ -12396,14 +12446,20 @@ class getAllUserSSHPubKeys_args:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('getAllUserSSHPubKeys_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ 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()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
+ if self.authzToken is None:
+ raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.userName is None:
raise TProtocol.TProtocolException(message='Required field userName is unset!')
return
@@ -12411,6 +12467,7 @@ class getAllUserSSHPubKeys_args:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.userName)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/eb4a737c/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index f62b13d..d34c29d 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -135,17 +135,21 @@ service Airavata {
*
**/
- string generateAndRegisterSSHKeys (1: required string gatewayId, 2: required string userName)
+ string generateAndRegisterSSHKeys (1: required security_model.AuthzToken authzToken,
+ 2: required string gatewayId,
+ 3: required string userName)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase)
- string getSSHPubKey (1: required string airavataCredStoreToken)
+ string getSSHPubKey (1: required security_model.AuthzToken authzToken,
+ 2: required string airavataCredStoreToken)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase)
- map<string, string> getAllUserSSHPubKeys (1: required string userName)
+ map<string, string> getAllUserSSHPubKeys (1: required security_model.AuthzToken authzToken,
+ 2: required string userName)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase)