You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/07/07 19:29:47 UTC
[01/53] [abbrv] airavata git commit: adding get all users in gateway
method
Repository: airavata
Updated Branches:
refs/heads/master 0f962e737 -> 461f7ec48
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 28648c4..98147cd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index 1ded9c1..4658dac 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index 04d774b..be08757 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 0ba4c15..4b10525 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index d9a4523..0a4b83b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index 7473515..fe66d71 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 f899a2c..0106ee3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 d44a9de..34abe2b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index ff0d52f..7fa91a5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 4e1fee5..ae3d0b5 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.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 b6dee9a..65af2d0 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.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
index bee5b47..955436c 100644
--- a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
+++ b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
@@ -170,6 +170,7 @@
/airavata/getWorkflow|
/airavata/getWorkflowTemplateId|
/airavata/isWorkflowExistWithName|
+/airavata/getAllUsersInGateway|
/airavata/registerDataProduct|
/airavata/getDataProduct|
/airavata/registerReplicaLocation|
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 8a0283e..ef14eed 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -60,7 +60,6 @@ public class AppCatalogJPAUtils {
properties.put("openjpa.ConnectionProperties", connectionProperties);
properties.put("openjpa.DynamicEnhancementAgent", "true");
properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
- properties.put("openjpa.Multithreaded", "true");
// For app catalog, we don't need caching
// properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
// properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
index 3ff27cb..6533ab2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
@@ -58,7 +58,6 @@ public class ExpCatResourceUtils {
// properties.put("openjpa.QueryCache","" + Utils.isCachingEnabled() + "(CacheSize=" + Utils.getJPACacheSize() + ", SoftReferenceSize=0)");
// properties.put("javax.persistence.sharedCache.mode","ALL");
properties.put("openjpa.RemoteCommitProvider","sjvm");
- properties.put("openjpa.Multithreaded", "true");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
@@ -372,4 +371,35 @@ public class ExpCatResourceUtils {
}
}
+
+ public static List<String> getAllUsersInGateway(String gatewayId) throws RegistryException {
+ EntityManager em = null;
+ try {
+ em = getEntityManager();
+ em.getTransaction().begin();
+ QueryGenerator generator = new QueryGenerator(AbstractExpCatResource.USERS);
+ generator.setParameter(AbstractExpCatResource.UserConstants.GATEWAY_ID, gatewayId);
+ Query q = generator.selectQuery(em);
+ List<Users> users = q.getResultList();
+ em.getTransaction().commit();
+ em.close();
+ ArrayList<String> usernameList = new ArrayList<>();
+ if(usernameList != null) {
+ for (int i = 0; i<usernameList.size(); i++){
+ usernameList.add(users.get(i).getUserName());
+ }
+ }
+ return usernameList;
+ } catch (Exception e){
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ }finally {
+ if (em != null && em.isOpen()){
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/utils/ReplicaCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/utils/ReplicaCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/utils/ReplicaCatalogJPAUtils.java
index 935c64f..d269ccc 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/utils/ReplicaCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/utils/ReplicaCatalogJPAUtils.java
@@ -60,7 +60,6 @@ public class ReplicaCatalogJPAUtils {
properties.put("openjpa.DynamicEnhancementAgent", "true");
properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
properties.put("openjpa.RemoteCommitProvider","sjvm");
- properties.put("openjpa.Multithreaded", "true");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.jdbc.QuerySQLCache", "false");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogJPAUtils.java
index c6d6f7b..c78ef9b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/utils/WorkflowCatalogJPAUtils.java
@@ -60,7 +60,6 @@ public class WorkflowCatalogJPAUtils {
properties.put("openjpa.ConnectionProperties", connectionProperties);
properties.put("openjpa.DynamicEnhancementAgent", "true");
properties.put("openjpa.RuntimeUnenhancedClasses", "unsupported");
- properties.put("openjpa.Multithreaded", "true");
// For app catalog, we don't need caching
// properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
// properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index e181561..621d3fb 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -114,6 +114,23 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
+
+ /**
+ * Get all users in the gateway
+ *
+ * @param gatewayId
+ * The gateway data model.
+ *
+ * @return users
+ * list of usernames of the users in the gateway
+ *
+ **/
+ list<string> getAllUsersInGateway(1: required security_model.AuthzToken authzToken, 2: required string gatewayId)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.AiravataClientException ace,
+ 3: airavata_errors.AiravataSystemException ase,
+ 4: airavata_errors.AuthorizationException ae)
+
/**
* Update previously registered Gateway metadata.
*
[18/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 f23a761..c45d6fd 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
@@ -484,168 +484,6 @@ public class Airavata {
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 User Experiments by Name
- * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user who created the experiments.
- *
- * @param expName
- * Experiment name to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param expName
- * @param limit
- * @param offset
- */
- 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 By Experiment Description
- * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @param description
- * Experiment description to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param description
- * @param limit
- * @param offset
- */
- 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 Experiment By the Application
- * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @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.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param applicationId
- * @param limit
- * @param offset
- */
- 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 User Experiments by Status
- * Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user making the request.
- *
- * @param experimentState
- * Experiement state to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param experimentState
- * @param limit
- * @param offset
- */
- 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 User Experiments by the Creation Time
- * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique 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.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- * @return ExperimentSummaryModel
- * List of experiments for the given search filter. Here only the Experiment summary will be returned.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- * @param limit
- * @param offset
- */
- 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.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
*
@@ -2761,16 +2599,6 @@ public class Airavata {
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 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 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 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 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 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;
@@ -4034,207 +3862,6 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
}
- 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_searchExperimentsByName(authzToken, gatewayId, userName, expName, limit, offset);
- return recv_searchExperimentsByName();
- }
-
- 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
- {
- searchExperimentsByName_args args = new searchExperimentsByName_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExpName(expName);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByName", 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- searchExperimentsByName_result result = new searchExperimentsByName_result();
- receiveBase(result, "searchExperimentsByName");
- 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, "searchExperimentsByName failed: unknown result");
- }
-
- 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_searchExperimentsByDesc(authzToken, gatewayId, userName, description, limit, offset);
- return recv_searchExperimentsByDesc();
- }
-
- 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
- {
- searchExperimentsByDesc_args args = new searchExperimentsByDesc_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setDescription(description);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByDesc", 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
- receiveBase(result, "searchExperimentsByDesc");
- 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, "searchExperimentsByDesc failed: unknown result");
- }
-
- 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_searchExperimentsByApplication(authzToken, gatewayId, userName, applicationId, limit, offset);
- return recv_searchExperimentsByApplication();
- }
-
- 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
- {
- searchExperimentsByApplication_args args = new searchExperimentsByApplication_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setApplicationId(applicationId);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchExperimentsByApplication", 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
- receiveBase(result, "searchExperimentsByApplication");
- 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, "searchExperimentsByApplication failed: unknown result");
- }
-
- 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_searchExperimentsByStatus(authzToken, gatewayId, userName, experimentState, limit, offset);
- return recv_searchExperimentsByStatus();
- }
-
- 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
- {
- searchExperimentsByStatus_args args = new searchExperimentsByStatus_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExperimentState(experimentState);
- args.setLimit(limit);
- args.setOffset(offset);
- 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.airavata.model.error.AuthorizationException, 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;
- }
- 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> 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_searchExperimentsByCreationTime(authzToken, gatewayId, userName, fromTime, toTime, limit, offset);
- return recv_searchExperimentsByCreationTime();
- }
-
- 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
- {
- searchExperimentsByCreationTime_args args = new searchExperimentsByCreationTime_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setFromTime(fromTime);
- args.setToTime(toTime);
- args.setLimit(limit);
- args.setOffset(offset);
- 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.airavata.model.error.AuthorizationException, 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;
- }
- if (result.ae != null) {
- throw result.ae;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime 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);
@@ -9483,244 +9110,6 @@ public class Airavata {
}
}
- 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 {
- checkReady();
- searchExperimentsByName_call method_call = new searchExperimentsByName_call(authzToken, gatewayId, userName, expName, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchExperimentsByName_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private String expName;
- private int limit;
- private int offset;
- public searchExperimentsByName_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String expName, int limit, int offset, 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;
- this.expName = expName;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchExperimentsByName", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchExperimentsByName_args args = new searchExperimentsByName_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExpName(expName);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchExperimentsByName();
- }
- }
-
- 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 {
- checkReady();
- searchExperimentsByDesc_call method_call = new searchExperimentsByDesc_call(authzToken, gatewayId, userName, description, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchExperimentsByDesc_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private String description;
- private int limit;
- private int offset;
- public searchExperimentsByDesc_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, 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;
- this.description = description;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchExperimentsByDesc", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchExperimentsByDesc_args args = new searchExperimentsByDesc_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setDescription(description);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchExperimentsByDesc();
- }
- }
-
- 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 {
- checkReady();
- searchExperimentsByApplication_call method_call = new searchExperimentsByApplication_call(authzToken, gatewayId, userName, applicationId, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchExperimentsByApplication_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private String applicationId;
- private int limit;
- private int offset;
- public searchExperimentsByApplication_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String applicationId, int limit, int offset, 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;
- this.applicationId = applicationId;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchExperimentsByApplication", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchExperimentsByApplication_args args = new searchExperimentsByApplication_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setApplicationId(applicationId);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchExperimentsByApplication();
- }
- }
-
- 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 {
- checkReady();
- searchExperimentsByStatus_call method_call = new searchExperimentsByStatus_call(authzToken, gatewayId, userName, experimentState, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchExperimentsByStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private org.apache.airavata.model.status.ExperimentState experimentState;
- private int limit;
- private int offset;
- public searchExperimentsByStatus_call(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, 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;
- this.experimentState = experimentState;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchExperimentsByStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchExperimentsByStatus_args args = new searchExperimentsByStatus_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setExperimentState(experimentState);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchExperimentsByStatus();
- }
- }
-
- 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 {
- checkReady();
- searchExperimentsByCreationTime_call method_call = new searchExperimentsByCreationTime_call(authzToken, gatewayId, userName, fromTime, toTime, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchExperimentsByCreationTime_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private long fromTime;
- private long toTime;
- private int limit;
- private int offset;
- public searchExperimentsByCreationTime_call(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, 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;
- this.fromTime = fromTime;
- this.toTime = toTime;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchExperimentsByCreationTime", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchExperimentsByCreationTime_args args = new searchExperimentsByCreationTime_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setFromTime(fromTime);
- args.setToTime(toTime);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.experiment.ExperimentSummaryModel> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchExperimentsByCreationTime();
- }
- }
-
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 {
checkReady();
searchExperiments_call method_call = new searchExperiments_call(authzToken, gatewayId, userName, filters, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
@@ -13983,11 +13372,6 @@ public class Airavata {
processMap.put("getUserProjects", new getUserProjects());
processMap.put("searchProjectsByProjectName", new searchProjectsByProjectName());
processMap.put("searchProjectsByProjectDesc", new searchProjectsByProjectDesc());
- processMap.put("searchExperimentsByName", new searchExperimentsByName());
- processMap.put("searchExperimentsByDesc", new searchExperimentsByDesc());
- processMap.put("searchExperimentsByApplication", new searchExperimentsByApplication());
- processMap.put("searchExperimentsByStatus", new searchExperimentsByStatus());
- processMap.put("searchExperimentsByCreationTime", new searchExperimentsByCreationTime());
processMap.put("searchExperiments", new searchExperiments());
processMap.put("getExperimentStatistics", new getExperimentStatistics());
processMap.put("getExperimentsInProject", new getExperimentsInProject());
@@ -14945,156 +14329,6 @@ public class Airavata {
}
}
- public static class searchExperimentsByName<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperimentsByName_args> {
- public searchExperimentsByName() {
- super("searchExperimentsByName");
- }
-
- public searchExperimentsByName_args getEmptyArgsInstance() {
- return new searchExperimentsByName_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchExperimentsByName_result getResult(I iface, searchExperimentsByName_args args) throws org.apache.thrift.TException {
- searchExperimentsByName_result result = new searchExperimentsByName_result();
- try {
- result.success = iface.searchExperimentsByName(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class searchExperimentsByDesc<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperimentsByDesc_args> {
- public searchExperimentsByDesc() {
- super("searchExperimentsByDesc");
- }
-
- public searchExperimentsByDesc_args getEmptyArgsInstance() {
- return new searchExperimentsByDesc_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchExperimentsByDesc_result getResult(I iface, searchExperimentsByDesc_args args) throws org.apache.thrift.TException {
- searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
- try {
- result.success = iface.searchExperimentsByDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class searchExperimentsByApplication<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperimentsByApplication_args> {
- public searchExperimentsByApplication() {
- super("searchExperimentsByApplication");
- }
-
- public searchExperimentsByApplication_args getEmptyArgsInstance() {
- return new searchExperimentsByApplication_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchExperimentsByApplication_result getResult(I iface, searchExperimentsByApplication_args args) throws org.apache.thrift.TException {
- searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
- try {
- result.success = iface.searchExperimentsByApplication(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class searchExperimentsByStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperimentsByStatus_args> {
- public searchExperimentsByStatus() {
- super("searchExperimentsByStatus");
- }
-
- public searchExperimentsByStatus_args getEmptyArgsInstance() {
- return new searchExperimentsByStatus_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchExperimentsByStatus_result getResult(I iface, searchExperimentsByStatus_args args) throws org.apache.thrift.TException {
- searchExperimentsByStatus_result result = new searchExperimentsByStatus_result();
- try {
- result.success = iface.searchExperimentsByStatus(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class searchExperimentsByCreationTime<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperimentsByCreationTime_args> {
- public searchExperimentsByCreationTime() {
- super("searchExperimentsByCreationTime");
- }
-
- public searchExperimentsByCreationTime_args getEmptyArgsInstance() {
- return new searchExperimentsByCreationTime_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchExperimentsByCreationTime_result getResult(I iface, searchExperimentsByCreationTime_args args) throws org.apache.thrift.TException {
- searchExperimentsByCreationTime_result result = new searchExperimentsByCreationTime_result();
- try {
- result.success = iface.searchExperimentsByCreationTime(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
public static class searchExperiments<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchExperiments_args> {
public searchExperiments() {
super("searchExperiments");
@@ -18608,11 +17842,6 @@ public class Airavata {
processMap.put("getUserProjects", new getUserProjects());
processMap.put("searchProjectsByProjectName", new searchProjectsByProjectName());
processMap.put("searchProjectsByProjectDesc", new searchProjectsByProjectDesc());
- processMap.put("searchExperimentsByName", new searchExperimentsByName());
- processMap.put("searchExperimentsByDesc", new searchExperimentsByDesc());
- processMap.put("searchExperimentsByApplication", new searchExperimentsByApplication());
- processMap.put("searchExperimentsByStatus", new searchExperimentsByStatus());
- processMap.put("searchExperimentsByCreationTime", new searchExperimentsByCreationTime());
processMap.put("searchExperiments", new searchExperiments());
processMap.put("getExperimentStatistics", new getExperimentStatistics());
processMap.put("getExperimentsInProject", new getExperimentsInProject());
@@ -20732,20 +19961,20 @@ public class Airavata {
}
}
- public static class searchExperimentsByName<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperimentsByName_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperimentsByName() {
- super("searchExperimentsByName");
+ public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
+ public searchExperiments() {
+ super("searchExperiments");
}
- public searchExperimentsByName_args getEmptyArgsInstance() {
- return new searchExperimentsByName_args();
+ public searchExperiments_args getEmptyArgsInstance() {
+ return new searchExperiments_args();
}
public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperimentsByName_result result = new searchExperimentsByName_result();
+ searchExperiments_result result = new searchExperiments_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20758,7 +19987,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperimentsByName_result result = new searchExperimentsByName_result();
+ searchExperiments_result result = new searchExperiments_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20799,25 +20028,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperimentsByName_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperimentsByName(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset,resultHandler);
+ public void start(I iface, searchExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
+ iface.searchExperiments(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset,resultHandler);
}
}
- public static class searchExperimentsByDesc<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperimentsByDesc_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperimentsByDesc() {
- super("searchExperimentsByDesc");
+ public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics> {
+ public getExperimentStatistics() {
+ super("getExperimentStatistics");
}
- public searchExperimentsByDesc_args getEmptyArgsInstance() {
- return new searchExperimentsByDesc_args();
+ public getExperimentStatistics_args getEmptyArgsInstance() {
+ return new getExperimentStatistics_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics>() {
+ public void onComplete(org.apache.airavata.model.experiment.ExperimentStatistics o) {
+ getExperimentStatistics_result result = new getExperimentStatistics_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20830,7 +20059,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperimentsByDesc_result result = new searchExperimentsByDesc_result();
+ getExperimentStatistics_result result = new getExperimentStatistics_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20871,25 +20100,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperimentsByDesc_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperimentsByDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset,resultHandler);
+ public void start(I iface, getExperimentStatistics_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> resultHandler) throws TException {
+ iface.getExperimentStatistics(args.authzToken, args.gatewayId, args.fromTime, args.toTime,resultHandler);
}
}
- public static class searchExperimentsByApplication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperimentsByApplication_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperimentsByApplication() {
- super("searchExperimentsByApplication");
+ public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public getExperimentsInProject() {
+ super("getExperimentsInProject");
}
- public searchExperimentsByApplication_args getEmptyArgsInstance() {
- return new searchExperimentsByApplication_args();
+ public getExperimentsInProject_args getEmptyArgsInstance() {
+ return new getExperimentsInProject_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
+ public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
+ getExperimentsInProject_result result = new getExperimentsInProject_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20902,7 +20131,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperimentsByApplication_result result = new searchExperimentsByApplication_result();
+ getExperimentsInProject_result result = new getExperimentsInProject_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20918,6 +20147,11 @@ public class Airavata {
result.setAseIsSet(true);
msg = result;
}
+ else if (e instanceof org.apache.airavata.model.error.ProjectNotFoundException) {
+ result.pnfe = (org.apache.airavata.model.error.ProjectNotFoundException) e;
+ result.setPnfeIsSet(true);
+ msg = result;
+ }
else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
@@ -20943,25 +20177,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperimentsByApplication_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperimentsByApplication(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset,resultHandler);
+ public void start(I iface, getExperimentsInProject_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
+ iface.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset,resultHandler);
}
}
- public static class searchExperimentsByStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperimentsByStatus_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperimentsByStatus() {
- super("searchExperimentsByStatus");
+ public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public getUserExperiments() {
+ super("getUserExperiments");
}
- public searchExperimentsByStatus_args getEmptyArgsInstance() {
- return new searchExperimentsByStatus_args();
+ public getUserExperiments_args getEmptyArgsInstance() {
+ return new getUserExperiments_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperimentsByStatus_result result = new searchExperimentsByStatus_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
+ public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
+ getUserExperiments_result result = new getUserExperiments_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20974,7 +20208,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperimentsByStatus_result result = new searchExperimentsByStatus_result();
+ getUserExperiments_result result = new getUserExperiments_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -21015,25 +20249,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperimentsByStatus_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperimentsByStatus(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset,resultHandler);
+ public void start(I iface, getUserExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
+ iface.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset,resultHandler);
}
}
- public static class searchExperimentsByCreationTime<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperimentsByCreationTime_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperimentsByCreationTime() {
- super("searchExperimentsByCreationTime");
+ public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, String> {
+ public createExperiment() {
+ super("createExperiment");
}
- public searchExperimentsByCreationTime_args getEmptyArgsInstance() {
- return new searchExperimentsByCreationTime_args();
+ public createExperiment_args getEmptyArgsInstance() {
+ return new createExperiment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperimentsByCreationTime_result result = new searchExperimentsByCreationTime_result();
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ createExperiment_result result = new createExperiment_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -21046,7 +20280,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperimentsByCreationTime_result result = new searchExperimentsByCreationTime_result();
+ createExperiment_result result = new createExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -21087,26 +20321,27 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperimentsByCreationTime_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperimentsByCreationTime(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset,resultHandler);
+ public void start(I iface, createExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.createExperiment(args.authzToken, args.gatewayId, args.experiment,resultHandler);
}
}
- public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperiments() {
- super("searchExperiments");
+ public static class deleteExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteExperiment_args, Boolean> {
+ public deleteExperiment() {
+ super("deleteExperiment");
}
- public searchExperiments_args getEmptyArgsInstance() {
- return new searchExperiments_args();
+ public deleteExperiment_args getEmptyArgsInstance() {
+ return new deleteExperiment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperiments_result result = new searchExperiments_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ deleteExperiment_result result = new deleteExperiment_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -21118,7 +20353,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperiments_result result = new searchExperiments_result();
+ deleteExperiment_result result = new deleteExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -21159,25 +20394,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperiments(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset,resultHandler);
+ public void start(I iface, deleteExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.deleteExperiment(args.authzToken, args.experimentId,resultHandler);
}
}
- public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics> {
- public getExperimentStatistics() {
- super("getExperimentStatistics");
+ public static class getExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperiment_args, org.apache.airavata.model.experiment.ExperimentModel> {
+ public getExperiment() {
+ super("getExperiment");
}
- public getExperimentStatistics_args getEmptyArgsInstance() {
- return new getExperimentStatistics_args();
+ public getExperiment_args getEmptyArgsInstance() {
+ return new getExperiment_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics>() {
- public void onComplete(org.apache.airavata.model.experiment.ExperimentStatistics o) {
- getExperimentStatistics_result result = new getExperimentStatistics_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel>() {
+ public void onComplete(org.apache.airavata.model.experiment.ExperimentModel o) {
+ getExperiment_result result = new getExperiment_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -21190,12 +20425,17 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentStatistics_result result = new getExperimentStatistics_result();
+ getExperiment_result result = new getExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
msg = result;
}
+ else if (e instanceof org.apache.airavata.model.error.ExperimentNotFoundException) {
+ result.enf = (org.apache.airavata.model.error.ExperimentNotFoundException) e;
+ result.setEnfIsSet(true);
+ msg = result;
+ }
else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
result.setAceIsSet(true);
@@ -21231,25 +20471,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentStatistics_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> resultHandler) throws TException {
- iface.getExperimentStatistics(args.authzToken, args.gatewayId, args.fromTime, args.toTime,resultHandler);
+ public void start(I iface, getExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel> resultHandler) throws TException {
+ iface.getExperiment(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
- public getExperimentsInProject() {
- super("getExperimentsInProject");
+ public static class getDetailedExperimentTree<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getDetailedExperimentTree_args, org.apache.airavata.model.experiment.ExperimentModel> {
+ public getDetailedExperimentTree() {
+ super("getDetailedExperimentTree");
}
- public getExperimentsInProject_args getEmptyArgsInstance() {
- return new getExperimentsInProject_args();
+ public getDetailedExperimentTree_args getEmptyArgsInstance() {
+ return new getDetailedExperimentTree_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
- getExperimentsInProject_result result = new getExperimentsInProject_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel>() {
+ public void onComplete(org.apache.airavata.model.experiment.ExperimentModel o) {
+ getDetailedExperimentTree_result result = new getDetailedExperimentTree_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -21262,12 +20502,17 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentsInProject_result result = new getExperimentsInProject_result();
+ getDetailedExperimentTree_result result = new getDetailedExperimentTree_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
msg = result;
}
+ else if (e instanceof org.apache.airavata.model.error.ExperimentNotFoundException) {
+ result.enf = (org.apache.airavata.model.error.ExperimentNotFoundException) e;
+ result.setEnfIsSet(true);
+ msg = result;
+ }
else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
result.setAceIsSet(true);
@@ -21278,11 +20523,6 @@ public class Airavata {
result.setAseIsSet(true);
msg = result;
}
- else if (e instanceof org.apache.airavata.model.error.ProjectNotFoundException) {
- result.pnfe = (org.apache.airavata.model.error.ProjectNotFoundException) e;
- result.setPnfeIsSet(true);
- msg = result;
- }
else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
@@ -21308,26 +20548,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentsInProject_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
- iface.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset,resultHandler);
+ public void start(I iface, getDetailedExperimentTree_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentModel> resultHandler) throws TException {
+ iface.getDetailedExperimentTree(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
- public getUserExperiments() {
- super("getUserExperiments");
+ public static class updateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperiment_args, Void> {
+ public updateExperiment() {
+ super("updateExperiment");
}
- public getUserExperiments_args getEmptyArgsInstance() {
- return new getUserExperiments_args();
+ public updateExperiment_args getEmptyArgsInstance() {
+ return new updateExperiment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
- getUserExperiments_result result = new getUserExperiments_result();
- result.success = o;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ updateExperiment_result result = new updateExperiment_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -21339,12 +20578,17 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getUserExperiments_result result = new getUserExperiments_result();
+ updateExperiment_result result = new updateExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
msg = result;
}
+ else if (e instanceof org.apache.airavata.model.error.ExperimentNotFoundException) {
+ result.enf = (org.apache.airavata.model.error.ExperimentNotFoundException) e;
+ result.setEnfIsSet(true);
+ msg = result;
+ }
else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
result.setAceIsSet(true);
@@ -21380,26 +20624,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getUserExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
- iface.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset,resultHandler);
+ public void start(I iface, updateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.updateExperiment(args.authzToken, args.airavataExperimentId, args.experiment,resultHandler);
}
}
- public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, String> {
- public createExperiment() {
- super("createExperiment");
+ public static class updateExperimentConfiguration<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperimentConfiguration_args, Void> {
+ public updateExperimentConfiguration() {
+ super("updateExperimentConfiguration");
}
- public createExperiment_args getEmptyArgsInstance() {
- return new createExperiment_args();
+ public updateExperimentConfiguration_args getEmptyArgsInstance() {
+ return new updateExperimentConfiguration_args();
}
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- createExperiment_result result = new createExperiment_result();
- result.success = o;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ updateExperimentConfiguration_result result = new updateExperimentConfiguration_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -21411,23 +20654,8 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- createExperiment_result result = new createExperiment_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ updateExperimentConfiguration_result result = new updateExperimentConfiguration_result();
+ if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
msg = result;
@@ -21452,27 +20680,25 @@ public class Airavata {
return false;
}
- public void start(I iface, createExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.createExperiment(args.authzToken, args.gatewayId, args.experiment,resultHandler);
+ public void start(I iface, updateExperimentConfiguration_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.updateExperimentConfiguration(args.authzToken, args.airavataExperimentId, args.userConfiguration,resultHandler);
}
}
- public static class deleteExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteExperiment_args, Boolean> {
- public deleteExperiment() {
- super("deleteExperiment");
+ public static class updateResourceScheduleing<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceScheduleing_args, Void> {
+ public updateResourceScheduleing() {
+ super("updateResourceScheduleing");
}
- public deleteExperiment_args getEmptyArgsInstance() {
- return new deleteExperiment_args();
+ public updateResourceScheduleing_args getEmptyArgsInstance() {
+ return new updateResourceScheduleing_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- deleteExperiment_result result = new deleteExperiment_result();
- result.success = o;
- result.setSuccessIsSet(true);
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ updateResourceScheduleing_result result = new updateResourceScheduleing_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -21484,23 +20710,8 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteExperiment_result result = new deleteExperiment_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ updateResourceScheduleing_result result = new updateResourceScheduleing_result();
+ if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
msg = result;
@@ -21525,26 +20736,27 @@ public class Airavata {
return false;
}
- public void start(I iface, deleteExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteExperiment(args.authzToken, args.experimentId,resultHandler);
+ public void start(I iface, updateResourceScheduleing_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.updateResourceScheduleing(args.authzToken, args.airavataExperimentId, args.resourceScheduling,resultHandler);
}
}
- public static class getExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperiment_args, org.apache.airavata.model.experimen
<TRUNCATED>
[51/53] [abbrv] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sh...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7addfd91
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7addfd91
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7addfd91
Branch: refs/heads/master
Commit: 7addfd91640c46194ec2b2181275bcc80c1c05d6
Parents: 0b40482 73fee6b
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 6 14:49:14 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 6 14:49:14 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 4 +++-
.../java/org/apache/airavata/gfac/impl/task/DataStageTask.java | 3 +--
.../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[31/53] [abbrv] airavata git commit: testing where experiment id IN
clause
Posted by sh...@apache.org.
testing where experiment id IN clause
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4e53f23a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4e53f23a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4e53f23a
Branch: refs/heads/master
Commit: 4e53f23ae2eb30ab0c1f080c69cdc97836f94ad1
Parents: b34d8a4
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 17:54:42 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 17:54:42 2016 -0400
----------------------------------------------------------------------
.../api/server/handler/AiravataServerHandler.java | 14 +++++++++++---
.../experiment/catalog/impl/ExperimentRegistry.java | 8 ++++----
.../experiment/catalog/resources/WorkerResource.java | 11 ++++++++++-
3 files changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4e53f23a/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 8b4072f..94768b4 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
@@ -30,8 +30,8 @@ import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.credential.store.client.CredentialStoreClientFactory;
import org.apache.airavata.credential.store.cpi.CredentialStoreService;
-import org.apache.airavata.credential.store.datamodel.SSHCredential;
import org.apache.airavata.credential.store.datamodel.PasswordCredential;
+import org.apache.airavata.credential.store.datamodel.SSHCredential;
import org.apache.airavata.credential.store.exception.CredentialStoreException;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.Publisher;
@@ -870,7 +870,8 @@ public class AiravataServerHandler implements Airavata.Iface {
List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
Map<String, String> regFilters = new HashMap();
- regFilters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
+ //FIXME
+ //regFilters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
regFilters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
for(Map.Entry<ExperimentSearchFields, String> entry : filters.entrySet())
{
@@ -890,7 +891,14 @@ public class AiravataServerHandler implements Airavata.Iface {
regFilters.put(Constants.FieldConstants.ExperimentConstants.PROJECT_ID, entry.getValue());
}
}
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, regFilters, limit,
+
+ //FIXME
+ List<ExperimentModel> allUserExperiments = getUserExperiments(authzToken, gatewayId, userName, -1, 0);
+ List<String> accessibleExpIds = new ArrayList<>();
+ allUserExperiments.stream().forEach(e->accessibleExpIds.add(e.getExperimentId()));
+
+ List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.EXPERIMENT,
+ accessibleExpIds, regFilters, limit,
offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
summaries.add((ExperimentSummaryModel) object);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4e53f23a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 79e3c66..dd555b1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -1346,11 +1346,11 @@ public class ExperimentRegistry {
}
List<ExperimentSummaryResource> experimentSummaryResources;
if (fromTime != 0 && toTime != 0) {
- experimentSummaryResources = workerResource.searchExperiments(new Timestamp(fromTime), new Timestamp(toTime), fil
+ experimentSummaryResources = workerResource.searchExperiments(null, new Timestamp(fromTime), new Timestamp(toTime), fil
,limit , offset, orderByIdentifier, resultOrderType);
} else {
experimentSummaryResources = workerResource
- .searchExperiments(null, null, fil, limit, offset, orderByIdentifier, resultOrderType);
+ .searchExperiments(null, null, null, fil, limit, offset, orderByIdentifier, resultOrderType);
}
if (experimentSummaryResources != null && !experimentSummaryResources.isEmpty()) {
for (ExperimentSummaryResource ex : experimentSummaryResources) {
@@ -1398,11 +1398,11 @@ public class ExperimentRegistry {
}
List<ExperimentSummaryResource> experimentSummaryResources;
if (fromTime != 0 && toTime != 0) {
- experimentSummaryResources = workerResource.searchExperiments(new Timestamp(fromTime), new Timestamp(toTime), fil
+ experimentSummaryResources = workerResource.searchExperiments(accessibleIds, new Timestamp(fromTime), new Timestamp(toTime), fil
,limit , offset, orderByIdentifier, resultOrderType);
} else {
experimentSummaryResources = workerResource
- .searchExperiments(null, null, fil, limit, offset, orderByIdentifier, resultOrderType);
+ .searchExperiments(accessibleIds, null, null, fil, limit, offset, orderByIdentifier, resultOrderType);
}
if (experimentSummaryResources != null && !experimentSummaryResources.isEmpty()) {
for (ExperimentSummaryResource ex : experimentSummaryResources) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/4e53f23a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index cf2f59b..bddeae4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -588,13 +588,22 @@ public class WorkerResource extends AbstractExpCatResource {
* @return
* @throws org.apache.airavata.registry.cpi.RegistryException
*/
- public List<ExperimentSummaryResource> searchExperiments(Timestamp fromTime, Timestamp toTime, Map<String, String> filters, int limit,
+ public List<ExperimentSummaryResource> searchExperiments(List<String> accessibleIds, Timestamp fromTime, Timestamp toTime, Map<String, String> filters, int limit,
int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
List<ExperimentSummaryResource> result = new ArrayList();
EntityManager em = null;
try {
String query = "SELECT e FROM ExperimentSummary e " +
"WHERE ";
+
+ // FIXME There is a performance bottleneck for using IN clause. Try using temporary tables ?
+ if(accessibleIds != null){
+ query += " e.experimentId IN (";
+ for(String id : accessibleIds)
+ query += (id + ",");
+ query = query.substring(0, query.length()-1) + ") ";
+ }
+
if (filters.get(ExperimentStatusConstants.STATE) != null) {
String experimentState = ExperimentState.valueOf(filters.get(ExperimentStatusConstants.STATE)).toString();
query += "e.state='" + experimentState + "' AND ";
[42/53] [abbrv] airavata git commit: Deleted old script files
Posted by sh...@apache.org.
Deleted old script files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/94a9fca6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/94a9fca6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/94a9fca6
Branch: refs/heads/master
Commit: 94a9fca6ff7e9eed140d9c8e28df4da736dbf1dc
Parents: 5757f12
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jun 28 16:36:50 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:57:45 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/bin/airavata-server.sh | 116 -------------------
.../src/main/resources/bin/api-server.sh | 116 -------------------
.../src/main/resources/bin/gfac-server.sh | 116 -------------------
.../main/resources/bin/orchestrator-server.sh | 116 -------------------
.../src/main/resources/bin/workflow-server.sh | 116 -------------------
.../org/apache/airavata/server/ServerMain.java | 2 +-
6 files changed, 1 insertion(+), 581 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/distribution/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server.sh b/distribution/src/main/resources/bin/airavata-server.sh
deleted file mode 100755
index 25584e7..0000000
--- a/distribution/src/main/resources/bin/airavata-server.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-
-for var in "$@"
-do
- case $var in
- -xdebug)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND"
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- shift
- ;;
- -security)
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME"
- shift
- ;;
- start)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND"
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- LOGO=false
- STOP=true
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- ;;
- --force)
- FORCE=true
- shift
- ;;
- -nologo)
- LOGO=false
- shift
- ;;
- -h)
- echo "Usage: airavata-server.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop [--force] Stop all airavata servers."
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
- echo " -xdebug Start Airavata Server under JPDA debugger"
- echo " -security Enable Java 2 security"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- esac
-done
-if $LOGO ; then
- if [ -e $LOGO_FILE ]
- then
- cat $LOGO_FILE
- fi
-fi
-if $STOP && $FORCE ;
-then
- for f in `find . -name "server-start_*"`; do
- f_split=(${f//_/ });
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
- else
- java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
- fi
-fi
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/distribution/src/main/resources/bin/api-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/api-server.sh b/distribution/src/main/resources/bin/api-server.sh
deleted file mode 100755
index a2c1a52..0000000
--- a/distribution/src/main/resources/bin/api-server.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=apiserver"
-for var in "$@"
-do
- case $var in
- -xdebug)
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- shift
- ;;
- -security)
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME"
- shift
- ;;
- start)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- LOGO=false
- STOP=true
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- ;;
- --force)
- FORCE=true
- shift
- ;;
- -nologo)
- LOGO=false
- shift
- ;;
- -h)
- echo "Usage: airavata-server.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop [--force] Stop all airavata servers."
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
- echo " -xdebug Start Airavata Server under JPDA debugger"
- echo " -security Enable Java 2 security"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"
- shift
- esac
-done
-if $LOGO ; then
- if [ -e $LOGO_FILE ]
- then
- cat $LOGO_FILE
- fi
-fi
-if $STOP && $FORCE ;
-then
- for f in `find . -name "server-start_*"`; do
- f_split=(${f//_/ });
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
- else
- java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
- fi
-fi
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/distribution/src/main/resources/bin/gfac-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/gfac-server.sh b/distribution/src/main/resources/bin/gfac-server.sh
deleted file mode 100755
index cfa6fe2..0000000
--- a/distribution/src/main/resources/bin/gfac-server.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=gfac"
-for var in "$@"
-do
- case $var in
- -xdebug)
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- shift
- ;;
- -security)
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME"
- shift
- ;;
- start)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- LOGO=false
- STOP=true
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- ;;
- --force)
- FORCE=true
- shift
- ;;
- -nologo)
- LOGO=false
- shift
- ;;
- -h)
- echo "Usage: airavata-server.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop [--force] Stop all airavata servers."
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
- echo " -xdebug Start Airavata Server under JPDA debugger"
- echo " -security Enable Java 2 security"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"
- shift
- esac
-done
-if $LOGO ; then
- if [ -e $LOGO_FILE ]
- then
- cat $LOGO_FILE
- fi
-fi
-if $STOP && $FORCE ;
-then
- for f in `find . -name "server-start_*"`; do
- f_split=(${f//_/ });
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
- else
- java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
- fi
-fi
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/distribution/src/main/resources/bin/orchestrator-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/orchestrator-server.sh b/distribution/src/main/resources/bin/orchestrator-server.sh
deleted file mode 100755
index 5d782c5..0000000
--- a/distribution/src/main/resources/bin/orchestrator-server.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=orchestrator"
-for var in "$@"
-do
- case $var in
- -xdebug)
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- shift
- ;;
- -security)
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME"
- shift
- ;;
- start)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- LOGO=false
- STOP=true
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- ;;
- --force)
- FORCE=true
- shift
- ;;
- -nologo)
- LOGO=false
- shift
- ;;
- -h)
- echo "Usage: airavata-server.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop [--force] Stop all airavata servers."
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
- echo " -xdebug Start Airavata Server under JPDA debugger"
- echo " -security Enable Java 2 security"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"
- shift
- esac
-done
-if $LOGO ; then
- if [ -e $LOGO_FILE ]
- then
- cat $LOGO_FILE
- fi
-fi
-if $STOP && $FORCE ;
-then
- for f in `find . -name "server-start_*"`; do
- f_split=(${f//_/ });
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
- else
- java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
- fi
-fi
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/distribution/src/main/resources/bin/workflow-server.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/workflow-server.sh b/distribution/src/main/resources/bin/workflow-server.sh
deleted file mode 100755
index 870ec53..0000000
--- a/distribution/src/main/resources/bin/workflow-server.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=workflowserver"
-for var in "$@"
-do
- case $var in
- -xdebug)
- JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- shift
- ;;
- -security)
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy -Daxis2.home=$AIRAVATA_HOME"
- shift
- ;;
- start)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
- IS_DAEMON_MODE=true
- shift
- ;;
- stop)
- LOGO=false
- STOP=true
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
- shift
- ;;
- --force)
- FORCE=true
- shift
- ;;
- -nologo)
- LOGO=false
- shift
- ;;
- -h)
- echo "Usage: airavata-server.sh [command-options]"
- echo "command options:"
- echo " start Start server in daemon mode"
- echo " stop [--force] Stop all airavata servers."
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
- echo " -xdebug Start Airavata Server under JPDA debugger"
- echo " -security Enable Java 2 security"
- echo " -h Display this help and exit"
- shift
- exit 0
- ;;
- *)
- AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"
- shift
- esac
-done
-if $LOGO ; then
- if [ -e $LOGO_FILE ]
- then
- cat $LOGO_FILE
- fi
-fi
-if $STOP && $FORCE ;
-then
- for f in `find . -name "server-start_*"`; do
- f_split=(${f//_/ });
- echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- echo -n " Removing process file..."
- out=`rm $f 2>&1`
- if [ -z "$out" ]; then
- echo "done"
- else
- echo "failed (REASON: $out)"
- fi
- done
-else
- if $IS_DAEMON_MODE ; then
- echo "Starting airavata server in daemon mode..."
- nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > /dev/null 2>&1 &
- else
- java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
- org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
- fi
-fi
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/94a9fca6/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 888a33e..2e12a32 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -56,7 +56,7 @@ public class ServerMain {
private static final String API_SERVER = "apiserver";
private static final String CREDENTIAL_STORE = "credentialstore";
private static final String GFAC_SERVER = "gfac";
- private static final String ORCHESTRATOR = "orcestrator";
+ private static final String ORCHESTRATOR = "orchestrator";
private static ServerCnxnFactory cnxnFactory;
// private static boolean shutdownHookCalledBefore=false;
[22/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 c61c197..d68a61d 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
@@ -399,66 +399,36 @@ class AiravataIf {
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;
/**
- *
- * Search User Projects by Project Name
- * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique 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.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param projectName
- * @param limit
- * @param offset
- */
- 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 User Projects by Project Description
- * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param description
- * The description to be matched.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+ * *
+ * * Search User Projects
+ * * Search and get all Projects for user by project description or/and project name with pagination.
+ * * Results will be ordered based on creation time DESC.
+ * *
+ * * @param gatewayId
+ * * The unique identifier of the gateway making the request.
+ * *
+ * * @param userName
+ * * The identifier of the user.
+ * *
+ * * @param filters
+ * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ * *
+ * * @param limit
+ * * The amount results to be fetched.
+ * *
+ * * @param offset
+ * * The starting point of the results to be fetched.
+ * *
+ * *
*
* @param authzToken
* @param gatewayId
* @param userName
- * @param description
+ * @param filters
* @param limit
* @param offset
*/
- 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;
+ virtual void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments.
@@ -2615,10 +2585,7 @@ class AiravataNull : virtual public AiravataIf {
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 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 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 */) {
+ void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & /* filters */, 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 */) {
@@ -6581,182 +6548,28 @@ class Airavata_getUserProjects_presult {
};
+typedef struct _Airavata_searchProjects_args__isset {
+ _Airavata_searchProjects_args__isset() : filters(false) {}
+ bool filters :1;
+} _Airavata_searchProjects_args__isset;
-class Airavata_searchProjectsByProjectName_args {
+class Airavata_searchProjects_args {
public:
- 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) {
+ Airavata_searchProjects_args(const Airavata_searchProjects_args&);
+ Airavata_searchProjects_args& operator=(const Airavata_searchProjects_args&);
+ Airavata_searchProjects_args() : gatewayId(), userName(), limit(0), offset(0) {
}
- virtual ~Airavata_searchProjectsByProjectName_args() throw();
+ virtual ~Airavata_searchProjects_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- std::string projectName;
+ std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> filters;
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_limit(const int32_t val);
-
- void __set_offset(const int32_t val);
-
- bool operator == (const Airavata_searchProjectsByProjectName_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- 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_searchProjectsByProjectName_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectName_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_searchProjectsByProjectName_pargs {
- public:
-
-
- 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;
-
-};
-
-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_searchProjectsByProjectName_result__isset;
-
-class Airavata_searchProjectsByProjectName_result {
- public:
-
- Airavata_searchProjectsByProjectName_result(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result& operator=(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result() {
- }
-
- 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_searchProjectsByProjectName_result__isset __isset;
-
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_searchProjectsByProjectName_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_searchProjectsByProjectName_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectName_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-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_searchProjectsByProjectName_presult__isset;
-
-class Airavata_searchProjectsByProjectName_presult {
- public:
-
-
- 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_searchProjectsByProjectName_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_searchProjectsByProjectDesc_args {
- public:
-
- 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_searchProjectsByProjectDesc_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string gatewayId;
- std::string userName;
- std::string description;
- int32_t limit;
- int32_t offset;
+ _Airavata_searchProjects_args__isset __isset;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
@@ -6764,13 +6577,13 @@ class Airavata_searchProjectsByProjectDesc_args {
void __set_userName(const std::string& val);
- void __set_description(const std::string& val);
+ void __set_filters(const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & val);
void __set_limit(const int32_t val);
void __set_offset(const int32_t val);
- bool operator == (const Airavata_searchProjectsByProjectDesc_args & rhs) const
+ bool operator == (const Airavata_searchProjects_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -6778,7 +6591,7 @@ class Airavata_searchProjectsByProjectDesc_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(description == rhs.description))
+ if (!(filters == rhs.filters))
return false;
if (!(limit == rhs.limit))
return false;
@@ -6786,11 +6599,11 @@ class Airavata_searchProjectsByProjectDesc_args {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDesc_args &rhs) const {
+ bool operator != (const Airavata_searchProjects_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDesc_args & ) const;
+ bool operator < (const Airavata_searchProjects_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -6798,15 +6611,15 @@ class Airavata_searchProjectsByProjectDesc_args {
};
-class Airavata_searchProjectsByProjectDesc_pargs {
+class Airavata_searchProjects_pargs {
public:
- virtual ~Airavata_searchProjectsByProjectDesc_pargs() throw();
+ virtual ~Airavata_searchProjects_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const std::string* description;
+ const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> * filters;
const int32_t* limit;
const int32_t* offset;
@@ -6814,31 +6627,31 @@ class Airavata_searchProjectsByProjectDesc_pargs {
};
-typedef struct _Airavata_searchProjectsByProjectDesc_result__isset {
- _Airavata_searchProjectsByProjectDesc_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchProjects_result__isset {
+ _Airavata_searchProjects_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_searchProjectsByProjectDesc_result__isset;
+} _Airavata_searchProjects_result__isset;
-class Airavata_searchProjectsByProjectDesc_result {
+class Airavata_searchProjects_result {
public:
- Airavata_searchProjectsByProjectDesc_result(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result& operator=(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result() {
+ Airavata_searchProjects_result(const Airavata_searchProjects_result&);
+ Airavata_searchProjects_result& operator=(const Airavata_searchProjects_result&);
+ Airavata_searchProjects_result() {
}
- virtual ~Airavata_searchProjectsByProjectDesc_result() throw();
+ virtual ~Airavata_searchProjects_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_searchProjectsByProjectDesc_result__isset __isset;
+ _Airavata_searchProjects_result__isset __isset;
void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
@@ -6850,7 +6663,7 @@ class Airavata_searchProjectsByProjectDesc_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchProjectsByProjectDesc_result & rhs) const
+ bool operator == (const Airavata_searchProjects_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -6864,38 +6677,38 @@ class Airavata_searchProjectsByProjectDesc_result {
return false;
return true;
}
- bool operator != (const Airavata_searchProjectsByProjectDesc_result &rhs) const {
+ bool operator != (const Airavata_searchProjects_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchProjectsByProjectDesc_result & ) const;
+ bool operator < (const Airavata_searchProjects_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_searchProjectsByProjectDesc_presult__isset {
- _Airavata_searchProjectsByProjectDesc_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_searchProjects_presult__isset {
+ _Airavata_searchProjects_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_searchProjectsByProjectDesc_presult__isset;
+} _Airavata_searchProjects_presult__isset;
-class Airavata_searchProjectsByProjectDesc_presult {
+class Airavata_searchProjects_presult {
public:
- virtual ~Airavata_searchProjectsByProjectDesc_presult() throw();
+ virtual ~Airavata_searchProjects_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_searchProjectsByProjectDesc_presult__isset __isset;
+ _Airavata_searchProjects_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
@@ -22998,12 +22811,9 @@ class AiravataClient : virtual public AiravataIf {
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);
void send_getUserProjects(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset);
void recv_getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return);
- 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);
- void send_searchProjectsByProjectName(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 recv_searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return);
- 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);
- void send_searchProjectsByProjectDesc(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 recv_searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return);
+ void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset);
+ void send_searchProjects(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset);
+ void recv_searchProjects(std::vector< ::apache::airavata::model::workspace::Project> & _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);
void send_searchExperiments(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);
void recv_searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
@@ -23387,8 +23197,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getUserProjects(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchProjectsByProjectName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchProjectsByProjectDesc(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_searchProjects(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_searchExperiments(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getExperimentStatistics(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getExperimentsInProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -23532,8 +23341,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getProject"] = &AiravataProcessor::process_getProject;
processMap_["deleteProject"] = &AiravataProcessor::process_deleteProject;
processMap_["getUserProjects"] = &AiravataProcessor::process_getUserProjects;
- processMap_["searchProjectsByProjectName"] = &AiravataProcessor::process_searchProjectsByProjectName;
- processMap_["searchProjectsByProjectDesc"] = &AiravataProcessor::process_searchProjectsByProjectDesc;
+ processMap_["searchProjects"] = &AiravataProcessor::process_searchProjects;
processMap_["searchExperiments"] = &AiravataProcessor::process_searchExperiments;
processMap_["getExperimentStatistics"] = &AiravataProcessor::process_getExperimentStatistics;
processMap_["getExperimentsInProject"] = &AiravataProcessor::process_getExperimentsInProject;
@@ -23926,23 +23734,13 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchProjectsByProjectName(_return, authzToken, gatewayId, userName, projectName, limit, offset);
- }
- ifaces_[i]->searchProjectsByProjectName(_return, authzToken, gatewayId, userName, projectName, limit, offset);
- return;
- }
-
- 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) {
+ void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchProjectsByProjectDesc(_return, authzToken, gatewayId, userName, description, limit, offset);
+ ifaces_[i]->searchProjects(_return, authzToken, gatewayId, userName, filters, limit, offset);
}
- ifaces_[i]->searchProjectsByProjectDesc(_return, authzToken, gatewayId, userName, description, limit, offset);
+ ifaces_[i]->searchProjects(_return, authzToken, gatewayId, userName, filters, limit, offset);
return;
}
@@ -25149,12 +24947,9 @@ class AiravataConcurrentClient : virtual public AiravataIf {
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);
int32_t send_getUserProjects(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset);
void recv_getUserProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const int32_t seqid);
- 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);
- int32_t send_searchProjectsByProjectName(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 recv_searchProjectsByProjectName(std::vector< ::apache::airavata::model::workspace::Project> & _return, const int32_t seqid);
- 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);
- int32_t send_searchProjectsByProjectDesc(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 recv_searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const int32_t seqid);
+ void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset);
+ int32_t send_searchProjects(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset);
+ void recv_searchProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const int32_t seqid);
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);
int32_t send_searchExperiments(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);
void recv_searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 864d0e3..18de3bb 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
@@ -483,71 +483,38 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
- *
- * Search User Projects by Project Name
- * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique 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.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param projectName
- * @param limit
- * @param 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("searchProjectsByProjectName\n");
- }
-
- /**
- *
- * Search User Projects by Project Description
- * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param description
- * The description to be matched.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+ * *
+ * * Search User Projects
+ * * Search and get all Projects for user by project description or/and project name with pagination.
+ * * Results will be ordered based on creation time DESC.
+ * *
+ * * @param gatewayId
+ * * The unique identifier of the gateway making the request.
+ * *
+ * * @param userName
+ * * The identifier of the user.
+ * *
+ * * @param filters
+ * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ * *
+ * * @param limit
+ * * The amount results to be fetched.
+ * *
+ * * @param offset
+ * * The starting point of the results to be fetched.
+ * *
+ * *
*
* @param authzToken
* @param gatewayId
* @param userName
- * @param description
+ * @param filters
* @param limit
* @param 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) {
+ void searchProjects(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::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) {
// Your implementation goes here
- printf("searchProjectsByProjectDesc\n");
+ printf("searchProjects\n");
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
index d63d93a..0bf0ac2 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
@@ -60,6 +60,16 @@ const char* _kExperimentSearchFieldsNames[] = {
};
const std::map<int, const char*> _ExperimentSearchFields_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kExperimentSearchFieldsValues, _kExperimentSearchFieldsNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+int _kProjectSearchFieldsValues[] = {
+ ProjectSearchFields::PROJECT_NAME,
+ ProjectSearchFields::PROJECT_DESCRIPTION
+};
+const char* _kProjectSearchFieldsNames[] = {
+ "PROJECT_NAME",
+ "PROJECT_DESCRIPTION"
+};
+const std::map<int, const char*> _ProjectSearchFields_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kProjectSearchFieldsValues, _kProjectSearchFieldsNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
UserConfigurationDataModel::~UserConfigurationDataModel() throw() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
index a283fc6..c3e6fc0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
@@ -64,6 +64,15 @@ struct ExperimentSearchFields {
extern const std::map<int, const char*> _ExperimentSearchFields_VALUES_TO_NAMES;
+struct ProjectSearchFields {
+ enum type {
+ PROJECT_NAME = 0,
+ PROJECT_DESCRIPTION = 1
+ };
+};
+
+extern const std::map<int, const char*> _ProjectSearchFields_VALUES_TO_NAMES;
+
class UserConfigurationDataModel;
class ExperimentModel;
[05/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 d191286..fb7ef28 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
@@ -81,6 +81,22 @@ class AiravataIf {
virtual void addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway) = 0;
/**
+ * Get all users in the gateway
+ *
+ * @param gatewayId
+ * The gateway data model.
+ *
+ * @return users
+ * list of usernames of the users in the gateway
+ *
+ *
+ *
+ * @param authzToken
+ * @param gatewayId
+ */
+ virtual void getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
+
+ /**
* Update previously registered Gateway metadata.
*
* @param gatewayId
@@ -2685,6 +2701,9 @@ class AiravataNull : virtual public AiravataIf {
void addGateway(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::workspace::Gateway& /* gateway */) {
return;
}
+ void getAllUsersInGateway(std::vector<std::string> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */) {
+ return;
+ }
void updateGateway(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const ::apache::airavata::model::workspace::Gateway& /* updatedGateway */) {
return;
}
@@ -3570,6 +3589,142 @@ class Airavata_addGateway_presult {
};
+class Airavata_getAllUsersInGateway_args {
+ public:
+
+ Airavata_getAllUsersInGateway_args(const Airavata_getAllUsersInGateway_args&);
+ Airavata_getAllUsersInGateway_args& operator=(const Airavata_getAllUsersInGateway_args&);
+ Airavata_getAllUsersInGateway_args() : gatewayId() {
+ }
+
+ virtual ~Airavata_getAllUsersInGateway_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
+ std::string gatewayId;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
+ void __set_gatewayId(const std::string& val);
+
+ bool operator == (const Airavata_getAllUsersInGateway_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
+ return false;
+ if (!(gatewayId == rhs.gatewayId))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getAllUsersInGateway_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getAllUsersInGateway_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_getAllUsersInGateway_pargs {
+ public:
+
+
+ virtual ~Airavata_getAllUsersInGateway_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
+ const std::string* gatewayId;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getAllUsersInGateway_result__isset {
+ _Airavata_getAllUsersInGateway_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_getAllUsersInGateway_result__isset;
+
+class Airavata_getAllUsersInGateway_result {
+ public:
+
+ Airavata_getAllUsersInGateway_result(const Airavata_getAllUsersInGateway_result&);
+ Airavata_getAllUsersInGateway_result& operator=(const Airavata_getAllUsersInGateway_result&);
+ Airavata_getAllUsersInGateway_result() {
+ }
+
+ virtual ~Airavata_getAllUsersInGateway_result() throw();
+ std::vector<std::string> success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getAllUsersInGateway_result__isset __isset;
+
+ void __set_success(const std::vector<std::string> & val);
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+
+ void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
+
+ bool operator == (const Airavata_getAllUsersInGateway_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ if (!(ae == rhs.ae))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getAllUsersInGateway_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getAllUsersInGateway_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getAllUsersInGateway_presult__isset {
+ _Airavata_getAllUsersInGateway_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_getAllUsersInGateway_presult__isset;
+
+class Airavata_getAllUsersInGateway_presult {
+ public:
+
+
+ virtual ~Airavata_getAllUsersInGateway_presult() throw();
+ std::vector<std::string> * success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getAllUsersInGateway_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
class Airavata_updateGateway_args {
public:
@@ -23757,6 +23912,9 @@ class AiravataClient : virtual public AiravataIf {
void addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway);
void send_addGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway);
void recv_addGateway(std::string& _return);
+ void getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
+ void send_getAllUsersInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
+ void recv_getAllUsersInGateway(std::vector<std::string> & _return);
void updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway);
void send_updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway);
void recv_updateGateway();
@@ -24204,6 +24362,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getAPIVersion(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_isUserExists(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_addGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getAllUsersInGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -24353,6 +24512,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getAPIVersion"] = &AiravataProcessor::process_getAPIVersion;
processMap_["isUserExists"] = &AiravataProcessor::process_isUserExists;
processMap_["addGateway"] = &AiravataProcessor::process_addGateway;
+ processMap_["getAllUsersInGateway"] = &AiravataProcessor::process_getAllUsersInGateway;
processMap_["updateGateway"] = &AiravataProcessor::process_updateGateway;
processMap_["getGateway"] = &AiravataProcessor::process_getGateway;
processMap_["deleteGateway"] = &AiravataProcessor::process_deleteGateway;
@@ -24553,6 +24713,16 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
+ void getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->getAllUsersInGateway(_return, authzToken, gatewayId);
+ }
+ ifaces_[i]->getAllUsersInGateway(_return, authzToken, gatewayId);
+ return;
+ }
+
void updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway) {
size_t sz = ifaces_.size();
size_t i = 0;
@@ -25968,6 +26138,9 @@ class AiravataConcurrentClient : virtual public AiravataIf {
void addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway);
int32_t send_addGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway);
void recv_addGateway(std::string& _return, const int32_t seqid);
+ void getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
+ int32_t send_getAllUsersInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
+ void recv_getAllUsersInGateway(std::vector<std::string> & _return, const int32_t seqid);
void updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway);
int32_t send_updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway);
void recv_updateGateway(const int32_t seqid);
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 485d9cf..9e5be2e 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
@@ -90,6 +90,25 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
+ * Get all users in the gateway
+ *
+ * @param gatewayId
+ * The gateway data model.
+ *
+ * @return users
+ * list of usernames of the users in the gateway
+ *
+ *
+ *
+ * @param authzToken
+ * @param gatewayId
+ */
+ void getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
+ // Your implementation goes here
+ printf("getAllUsersInGateway\n");
+ }
+
+ /**
* Update previously registered Gateway metadata.
*
* @param gatewayId
[19/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
removing redundant experiment search API methods
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c9ddaeb3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c9ddaeb3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c9ddaeb3
Branch: refs/heads/master
Commit: c9ddaeb3de586a71d026a81e24eb1c7fe801b40d
Parents: 10b7b12
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 15:49:57 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 15:49:57 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 311 -
.../java/org/apache/airavata/api/Airavata.java | 15067 +++-------------
.../main/resources/lib/airavata/Airavata.cpp | 15252 +++++++----------
.../src/main/resources/lib/airavata/Airavata.h | 1405 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 177 -
.../resources/lib/Airavata/API/Airavata.php | 3644 +---
.../lib/apache/airavata/api/Airavata-remote | 35 -
.../lib/apache/airavata/api/Airavata.py | 2581 +--
.../airavata-apis/airavata_api.thrift | 167 -
9 files changed, 9647 insertions(+), 28992 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 f4edd91..7ff89d7 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
@@ -876,317 +876,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Search Experiments by experiment name 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 expName
- * Experiment name to be matched
- * @param limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
- @Override
- @SecurityCheck
- 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)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
- filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME, expName);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
- offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- summaries.add((ExperimentSummaryModel) object);
- }
- logger.debug("Airavata retrieved experiments for user : " + userName + " and gateway id : " + gatewayId + " with experiment name : " + expName);
- return summaries;
- }catch (Exception e) {
- logger.error("Error while retrieving experiments", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving experiments. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
- * Search Experiments by experiment name 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 limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
- @Override
- @SecurityCheck
- 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)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
- filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- filters.put(Constants.FieldConstants.ExperimentConstants.DESCRIPTION, description);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
- offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- summaries.add((ExperimentSummaryModel) object);
- }
- logger.debug("Airavata retrieved experiments for user : " + userName + " and gateway id : " + gatewayId + " with experiment description : " + description);
- return summaries;
- }catch (Exception e) {
- logger.error("Error while retrieving experiments", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving experiments. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
- * 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 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
- */
- @Override
- @SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByApplication(AuthzToken authzToken, String gatewayId,
- String userName, String applicationId,
- int limit, int offset)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
- if (!validateString(userName)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
- filters.put(Constants.FieldConstants.ExperimentConstants.EXECUTION_ID, applicationId);
- filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
- offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- summaries.add((ExperimentSummaryModel) object);
- }
- logger.debug("Airavata retrieved experiments for user : " + userName + " and gateway id : " + gatewayId + " with application id : " + applicationId);
- return summaries;
- }catch (Exception e) {
- logger.error("Error while retrieving experiments", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving experiments. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
- * 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 experimentState
- * Experiement state to be matched
- * @param limit
- * Amount of results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
- @Override
- @SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByStatus(AuthzToken authzToken, String gatewayId,
- String userName, ExperimentState experimentState,
- int limit, int offset)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
- if (!validateString(userName)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
- filters.put(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS, experimentState.toString());
- filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
- offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- summaries.add((ExperimentSummaryModel) object);
- }
- logger.debug("Airavata retrieved experiments for user : " + userName + " and gateway id : " + gatewayId + " with experiment status : " + experimentState);
- return summaries;
- }catch (Exception e) {
- logger.error("Error while retrieving experiments", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving experiments. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
- * 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 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
- */
- @Override
- @SecurityCheck
- public List<ExperimentSummaryModel> searchExperimentsByCreationTime(AuthzToken authzToken, String gatewayId,
- String userName, long fromTime,
- long toTime, int limit, int offset)
- throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
- if (!validateString(userName)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
- filters.put(Constants.FieldConstants.ExperimentConstants.FROM_DATE, String.valueOf(fromTime));
- filters.put(Constants.FieldConstants.ExperimentConstants.TO_DATE, String.valueOf(toTime));
- filters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, filters, limit,
- offset, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- summaries.add((ExperimentSummaryModel) object);
- }
- logger.debug("Airavata retrieved experiments for user : " + userName + " and gateway id : " + gatewayId + " with experiment creation time : " + AiravataUtils.getTime(fromTime));
- return summaries;
- }catch (Exception e) {
- logger.error("Error while retrieving experiments", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving experiments. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
* based on creation time DESC
*
[02/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 ba3b09f..ffd2732 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 66c7cd0..2a9bfaa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 25d6518..e17a7f3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 bea73e7..2c8eb50 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 95432f5..3c26935 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 458d51c..48c480f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 7628daf..eb8a96e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 8aec2fd..931ee3f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 588cab2..8aa6023 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 e62e529..da7dce3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 bdc2313..6f8b568 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 2eb649a..6faf1df 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index 63b314e..1a01f69 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index 69372b4..9f7aed3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 766835e..9c58d01 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 f9e4f57..c04162c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 3186780..194de57 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 a20d937..8b407cb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 e3228c1..bd14531 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index eb155f0..574ac82 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 9e87c66..a2fbedc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index d37ce47..f69f87a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index e2ee6e4..5a8f279 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index a7215e0..1548f26 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index e830a56..448cc72 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index 6a70020..10d292b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 11c1c4a..077f107 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 6d2bae2..ed5aba9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 3e74460..9613aea 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 2b6e08b..070c51a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 13d11d4..51fae23 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 b84eee6..a1724a2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 705fff9..1e0c429 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 a394817..5f6c416 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 7ee1b61..ed468cf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 a03aa88..073bbca 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 cba934d..7706211 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 315db39..c13af33 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 bbce1d4..ce8d5f5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 bf83b69..bab97b1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 eefe22c..49eac43 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 784ceb0..78fba1e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 6ad9763..6640e8e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 b7efdd6..9327fa2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 90f5e1c..b7967fc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 aa30526..3c06ee6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 3df58e0..918b840 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 f7a4679..be663c7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 9bbc1f3..aa09ca3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 7a252da..17b8df9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 d84b312..d3b8d7f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 c5163a0..b85850d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 fb2a805..7a4ad4d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 e30f1cb..d6ecde5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 d16614d..0b6a153 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 461590d..14b1cf9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 1ce93ff..1d36b92 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 b357795..22069d9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 354e0ff..f88ffff 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 62eeea2..a8efbcb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 53b0349..e616e04 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 cf2df66..ec39e4f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 73fd8b3..c1ce7a5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 0cf7938..42125d9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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");
[40/53] [abbrv] airavata git commit: Added all in one server starting
feature
Posted by sh...@apache.org.
Added all in one server starting feature
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/31f43152
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/31f43152
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/31f43152
Branch: refs/heads/master
Commit: 31f431523c331b0bccd54309409b3a8dd19d6b06
Parents: 11558d6
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Jun 24 14:26:41 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:32:37 2016 -0400
----------------------------------------------------------------------
.../main/resources/bin/airavata-server-start.sh | 18 +++++++++---
.../org/apache/airavata/server/ServerMain.java | 31 +++++++++++++-------
2 files changed, 35 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/31f43152/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
index 599fdd8..a3c9a72 100644
--- a/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -27,6 +27,7 @@ EXTRA_ARGS=""
SERVERS=""
IS_DAEMON_MODE=false
LOGO=true
+ALL_IN_ONE=false
# parse command arguments
for var in "$@"
@@ -41,7 +42,7 @@ do
JAVA_OPTS="${JAVA_OPTS} -Djava.security.manager -Djava.security.policy=${AIRAVATA_HOME}/conf/axis2.policy -Daxis2.home=${AIRAVATA_HOME}"
shift
;;
- api | gfac | orchestrator)
+ apiserver | gfac | orchestrator)
if [ -z ${SERVERS} ] ; then
SERVERS="${var}"
else
@@ -49,6 +50,10 @@ do
fi
shift
;;
+ all)
+ ALL_IN_ONE=true
+ shift
+ ;;
-d)
IS_DAEMON_MODE=true
shift
@@ -63,7 +68,8 @@ do
echo " apiserver Start apiserver"
echo " gfac Start gfac server"
echo " orchestrator Start orchestrator server"
- echo " credentialstore Start credentialstore server"
+ echo " credentialstore Start credentialstore server"
+ echo " all Start all servers in one JVM"
echo "command options:"
echo " -d Start server in daemon mode"
@@ -82,8 +88,12 @@ do
esac
done
-#add extra argument to the
-AIRAVATA_COMMAND="--servers=${SERVERS} ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+#Construct Airavata command arguments in proper order.
+if ${ALL_IN_ONE} ; then
+ AIRAVATA_COMMAND="--servers=all ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+else
+ AIRAVATA_COMMAND="--servers=${SERVERS} ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+fi
#print logo file
if ${LOGO} ; then
http://git-wip-us.apache.org/repos/asf/airavata/blob/31f43152/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 0661a32..b1db8e1 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -49,6 +49,7 @@ public class ServerMain {
private static boolean systemShutDown=false;
private static String STOP_COMMAND_STR = "stop";
+ private static String ALL_IN_ONE = "all";
// server names
private static String API_SERVER = "apiserver";
private static String CREDENTIAL_STORE = "credentialstore";
@@ -63,27 +64,29 @@ public class ServerMain {
private static void loadServers(String serverNames) {
try {
- if (serverNames !=null){
+ if (serverNames != null) {
List<String> serversList = handleServerDependencies(serverNames);
for (String serverString : serversList) {
- serverString=serverString.trim();
+ serverString = serverString.trim();
String serverClassName = ServerSettings.getSetting(serverString);
Class<?> classInstance;
try {
classInstance = ServerMain.class
- .getClassLoader().loadClass(
- serverClassName);
- servers.add((IServer)classInstance.newInstance());
+ .getClassLoader().loadClass(
+ serverClassName);
+ servers.add((IServer) classInstance.newInstance());
} catch (ClassNotFoundException e) {
- logger.error("Error while locating server implementation \""+serverString+"\"!!!",e);
+ logger.error("Error while locating server implementation \"" + serverString + "\"!!!", e);
} catch (InstantiationException e) {
- logger.error("Error while initiating server instance \""+serverString+"\"!!!",e);
+ logger.error("Error while initiating server instance \"" + serverString + "\"!!!", e);
} catch (IllegalAccessException e) {
- logger.error("Error while initiating server instance \""+serverString+"\"!!!",e);
- } catch (ClassCastException e){
- logger.error("Invalid server \""+serverString+"\"!!!",e);
+ logger.error("Error while initiating server instance \"" + serverString + "\"!!!", e);
+ } catch (ClassCastException e) {
+ logger.error("Invalid server \"" + serverString + "\"!!!", e);
}
}
+ } else {
+ logger.warn("No server name specify to start, use -h command line option to view help menu ...");
}
} catch (ApplicationSettingsException e) {
logger.error("Error while retrieving server list!!!",e);
@@ -99,6 +102,14 @@ public class ServerMain {
private static List<String> handleServerDependencies(String serverNames) {
List<String> serverList = new ArrayList<>(Arrays.asList(serverNames.split(",")));
+ if (serverList.indexOf(ALL_IN_ONE) > -1) {
+ serverList.clear();
+ serverList.add(CREDENTIAL_STORE); // credential store should start before api server
+ serverList.add(API_SERVER);
+ serverList.add(ORCHESTRATOR);
+ serverList.add(GFAC_SERVER);
+ return serverList;
+ }
// credential store should start before api server
int credPos = serverList.indexOf(CREDENTIAL_STORE);
if (credPos > 0) { // neither absent nor credentialstore is first element
[06/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 ffd20c7..553f1e5 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
@@ -893,11 +893,11 @@ uint32_t Airavata_addGateway_presult::read(::apache::thrift::protocol::TProtocol
}
-Airavata_updateGateway_args::~Airavata_updateGateway_args() throw() {
+Airavata_getAllUsersInGateway_args::~Airavata_getAllUsersInGateway_args() throw() {
}
-uint32_t Airavata_updateGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllUsersInGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -911,7 +911,6 @@ uint32_t Airavata_updateGateway_args::read(::apache::thrift::protocol::TProtocol
bool isset_authzToken = false;
bool isset_gatewayId = false;
- bool isset_updatedGateway = false;
while (true)
{
@@ -937,14 +936,6 @@ uint32_t Airavata_updateGateway_args::read(::apache::thrift::protocol::TProtocol
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->updatedGateway.read(iprot);
- isset_updatedGateway = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -958,15 +949,13 @@ uint32_t Airavata_updateGateway_args::read(::apache::thrift::protocol::TProtocol
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_updatedGateway)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_updateGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllUsersInGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateGateway_args");
+ xfer += oprot->writeStructBegin("Airavata_getAllUsersInGateway_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -976,24 +965,20 @@ uint32_t Airavata_updateGateway_args::write(::apache::thrift::protocol::TProtoco
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("updatedGateway", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->updatedGateway.write(oprot);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_updateGateway_pargs::~Airavata_updateGateway_pargs() throw() {
+Airavata_getAllUsersInGateway_pargs::~Airavata_getAllUsersInGateway_pargs() throw() {
}
-uint32_t Airavata_updateGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllUsersInGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateGateway_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getAllUsersInGateway_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -1003,21 +988,17 @@ uint32_t Airavata_updateGateway_pargs::write(::apache::thrift::protocol::TProtoc
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("updatedGateway", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += (*(this->updatedGateway)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_updateGateway_result::~Airavata_updateGateway_result() throw() {
+Airavata_getAllUsersInGateway_result::~Airavata_getAllUsersInGateway_result() throw() {
}
-uint32_t Airavata_updateGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllUsersInGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1038,6 +1019,26 @@ uint32_t Airavata_updateGateway_result::read(::apache::thrift::protocol::TProtoc
}
switch (fid)
{
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->success.clear();
+ uint32_t _size0;
+ ::apache::thrift::protocol::TType _etype3;
+ xfer += iprot->readListBegin(_etype3, _size0);
+ this->success.resize(_size0);
+ uint32_t _i4;
+ for (_i4 = 0; _i4 < _size0; ++_i4)
+ {
+ xfer += iprot->readString(this->success[_i4]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
case 1:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ire.read(iprot);
@@ -1082,13 +1083,25 @@ uint32_t Airavata_updateGateway_result::read(::apache::thrift::protocol::TProtoc
return xfer;
}
-uint32_t Airavata_updateGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllUsersInGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateGateway_result");
+ xfer += oprot->writeStructBegin("Airavata_getAllUsersInGateway_result");
- if (this->__isset.ire) {
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
+ std::vector<std::string> ::const_iterator _iter5;
+ for (_iter5 = this->success.begin(); _iter5 != this->success.end(); ++_iter5)
+ {
+ xfer += oprot->writeString((*_iter5));
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->ire.write(oprot);
xfer += oprot->writeFieldEnd();
@@ -1111,11 +1124,11 @@ uint32_t Airavata_updateGateway_result::write(::apache::thrift::protocol::TProto
}
-Airavata_updateGateway_presult::~Airavata_updateGateway_presult() throw() {
+Airavata_getAllUsersInGateway_presult::~Airavata_getAllUsersInGateway_presult() throw() {
}
-uint32_t Airavata_updateGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllUsersInGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1136,6 +1149,26 @@ uint32_t Airavata_updateGateway_presult::read(::apache::thrift::protocol::TProto
}
switch (fid)
{
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ (*(this->success)).clear();
+ uint32_t _size6;
+ ::apache::thrift::protocol::TType _etype9;
+ xfer += iprot->readListBegin(_etype9, _size6);
+ (*(this->success)).resize(_size6);
+ uint32_t _i10;
+ for (_i10 = 0; _i10 < _size6; ++_i10)
+ {
+ xfer += iprot->readString((*(this->success))[_i10]);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
case 1:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ire.read(iprot);
@@ -1181,11 +1214,11 @@ uint32_t Airavata_updateGateway_presult::read(::apache::thrift::protocol::TProto
}
-Airavata_getGateway_args::~Airavata_getGateway_args() throw() {
+Airavata_updateGateway_args::~Airavata_updateGateway_args() throw() {
}
-uint32_t Airavata_getGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1199,6 +1232,7 @@ uint32_t Airavata_getGateway_args::read(::apache::thrift::protocol::TProtocol* i
bool isset_authzToken = false;
bool isset_gatewayId = false;
+ bool isset_updatedGateway = false;
while (true)
{
@@ -1224,6 +1258,14 @@ uint32_t Airavata_getGateway_args::read(::apache::thrift::protocol::TProtocol* i
xfer += iprot->skip(ftype);
}
break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->updatedGateway.read(iprot);
+ isset_updatedGateway = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -1237,13 +1279,15 @@ uint32_t Airavata_getGateway_args::read(::apache::thrift::protocol::TProtocol* i
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_updatedGateway)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getGateway_args");
+ xfer += oprot->writeStructBegin("Airavata_updateGateway_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -1253,20 +1297,24 @@ uint32_t Airavata_getGateway_args::write(::apache::thrift::protocol::TProtocol*
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("updatedGateway", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->updatedGateway.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_getGateway_pargs::~Airavata_getGateway_pargs() throw() {
+Airavata_updateGateway_pargs::~Airavata_updateGateway_pargs() throw() {
}
-uint32_t Airavata_getGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getGateway_pargs");
+ xfer += oprot->writeStructBegin("Airavata_updateGateway_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -1276,17 +1324,21 @@ uint32_t Airavata_getGateway_pargs::write(::apache::thrift::protocol::TProtocol*
xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("updatedGateway", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += (*(this->updatedGateway)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_getGateway_result::~Airavata_getGateway_result() throw() {
+Airavata_updateGateway_result::~Airavata_updateGateway_result() throw() {
}
-uint32_t Airavata_getGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1307,14 +1359,6 @@ uint32_t Airavata_getGateway_result::read(::apache::thrift::protocol::TProtocol*
}
switch (fid)
{
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->success.read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 1:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ire.read(iprot);
@@ -1359,17 +1403,13 @@ uint32_t Airavata_getGateway_result::read(::apache::thrift::protocol::TProtocol*
return xfer;
}
-uint32_t Airavata_getGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getGateway_result");
+ xfer += oprot->writeStructBegin("Airavata_updateGateway_result");
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
- xfer += this->success.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
+ if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->ire.write(oprot);
xfer += oprot->writeFieldEnd();
@@ -1392,11 +1432,11 @@ uint32_t Airavata_getGateway_result::write(::apache::thrift::protocol::TProtocol
}
-Airavata_getGateway_presult::~Airavata_getGateway_presult() throw() {
+Airavata_updateGateway_presult::~Airavata_updateGateway_presult() throw() {
}
-uint32_t Airavata_getGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1417,14 +1457,6 @@ uint32_t Airavata_getGateway_presult::read(::apache::thrift::protocol::TProtocol
}
switch (fid)
{
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += (*(this->success)).read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 1:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ire.read(iprot);
@@ -1470,11 +1502,11 @@ uint32_t Airavata_getGateway_presult::read(::apache::thrift::protocol::TProtocol
}
-Airavata_deleteGateway_args::~Airavata_deleteGateway_args() throw() {
+Airavata_getGateway_args::~Airavata_getGateway_args() throw() {
}
-uint32_t Airavata_deleteGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1529,10 +1561,10 @@ uint32_t Airavata_deleteGateway_args::read(::apache::thrift::protocol::TProtocol
return xfer;
}
-uint32_t Airavata_deleteGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteGateway_args");
+ xfer += oprot->writeStructBegin("Airavata_getGateway_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -1548,14 +1580,14 @@ uint32_t Airavata_deleteGateway_args::write(::apache::thrift::protocol::TProtoco
}
-Airavata_deleteGateway_pargs::~Airavata_deleteGateway_pargs() throw() {
+Airavata_getGateway_pargs::~Airavata_getGateway_pargs() throw() {
}
-uint32_t Airavata_deleteGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteGateway_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getGateway_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -1571,11 +1603,11 @@ uint32_t Airavata_deleteGateway_pargs::write(::apache::thrift::protocol::TProtoc
}
-Airavata_deleteGateway_result::~Airavata_deleteGateway_result() throw() {
+Airavata_getGateway_result::~Airavata_getGateway_result() throw() {
}
-uint32_t Airavata_deleteGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1597,8 +1629,8 @@ uint32_t Airavata_deleteGateway_result::read(::apache::thrift::protocol::TProtoc
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -1648,15 +1680,15 @@ uint32_t Airavata_deleteGateway_result::read(::apache::thrift::protocol::TProtoc
return xfer;
}
-uint32_t Airavata_deleteGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteGateway_result");
+ xfer += oprot->writeStructBegin("Airavata_getGateway_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1681,11 +1713,11 @@ uint32_t Airavata_deleteGateway_result::write(::apache::thrift::protocol::TProto
}
-Airavata_deleteGateway_presult::~Airavata_deleteGateway_presult() throw() {
+Airavata_getGateway_presult::~Airavata_getGateway_presult() throw() {
}
-uint32_t Airavata_deleteGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1707,8 +1739,8 @@ uint32_t Airavata_deleteGateway_presult::read(::apache::thrift::protocol::TProto
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -1759,11 +1791,11 @@ uint32_t Airavata_deleteGateway_presult::read(::apache::thrift::protocol::TProto
}
-Airavata_getAllGateways_args::~Airavata_getAllGateways_args() throw() {
+Airavata_deleteGateway_args::~Airavata_deleteGateway_args() throw() {
}
-uint32_t Airavata_getAllGateways_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1776,6 +1808,7 @@ uint32_t Airavata_getAllGateways_args::read(::apache::thrift::protocol::TProtoco
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
+ bool isset_gatewayId = false;
while (true)
{
@@ -1793,6 +1826,14 @@ uint32_t Airavata_getAllGateways_args::read(::apache::thrift::protocol::TProtoco
xfer += iprot->skip(ftype);
}
break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -1804,48 +1845,58 @@ uint32_t Airavata_getAllGateways_args::read(::apache::thrift::protocol::TProtoco
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getAllGateways_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getAllGateways_args");
+ xfer += oprot->writeStructBegin("Airavata_deleteGateway_args");
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->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_getAllGateways_pargs::~Airavata_getAllGateways_pargs() throw() {
+Airavata_deleteGateway_pargs::~Airavata_deleteGateway_pargs() throw() {
}
-uint32_t Airavata_getAllGateways_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getAllGateways_pargs");
+ xfer += oprot->writeStructBegin("Airavata_deleteGateway_pargs");
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->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_getAllGateways_result::~Airavata_getAllGateways_result() throw() {
+Airavata_deleteGateway_result::~Airavata_deleteGateway_result() throw() {
}
-uint32_t Airavata_getAllGateways_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1867,20 +1918,8 @@ uint32_t Airavata_getAllGateways_result::read(::apache::thrift::protocol::TProto
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size0;
- ::apache::thrift::protocol::TType _etype3;
- xfer += iprot->readListBegin(_etype3, _size0);
- this->success.resize(_size0);
- uint32_t _i4;
- for (_i4 = 0; _i4 < _size0; ++_i4)
- {
- xfer += this->success[_i4].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -1930,23 +1969,15 @@ uint32_t Airavata_getAllGateways_result::read(::apache::thrift::protocol::TProto
return xfer;
}
-uint32_t Airavata_getAllGateways_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getAllGateways_result");
+ xfer += oprot->writeStructBegin("Airavata_deleteGateway_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::Gateway> ::const_iterator _iter5;
- for (_iter5 = this->success.begin(); _iter5 != this->success.end(); ++_iter5)
- {
- xfer += (*_iter5).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1971,11 +2002,11 @@ uint32_t Airavata_getAllGateways_result::write(::apache::thrift::protocol::TProt
}
-Airavata_getAllGateways_presult::~Airavata_getAllGateways_presult() throw() {
+Airavata_deleteGateway_presult::~Airavata_deleteGateway_presult() throw() {
}
-uint32_t Airavata_getAllGateways_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -1997,20 +2028,8 @@ uint32_t Airavata_getAllGateways_presult::read(::apache::thrift::protocol::TProt
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size6;
- ::apache::thrift::protocol::TType _etype9;
- xfer += iprot->readListBegin(_etype9, _size6);
- (*(this->success)).resize(_size6);
- uint32_t _i10;
- for (_i10 = 0; _i10 < _size6; ++_i10)
- {
- xfer += (*(this->success))[_i10].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2061,11 +2080,11 @@ uint32_t Airavata_getAllGateways_presult::read(::apache::thrift::protocol::TProt
}
-Airavata_isGatewayExist_args::~Airavata_isGatewayExist_args() throw() {
+Airavata_getAllGateways_args::~Airavata_getAllGateways_args() throw() {
}
-uint32_t Airavata_isGatewayExist_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGateways_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2078,7 +2097,6 @@ uint32_t Airavata_isGatewayExist_args::read(::apache::thrift::protocol::TProtoco
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_gatewayId = false;
while (true)
{
@@ -2096,14 +2114,6 @@ uint32_t Airavata_isGatewayExist_args::read(::apache::thrift::protocol::TProtoco
xfer += iprot->skip(ftype);
}
break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -2115,58 +2125,48 @@ uint32_t Airavata_isGatewayExist_args::read(::apache::thrift::protocol::TProtoco
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_isGatewayExist_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGateways_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_isGatewayExist_args");
+ xfer += oprot->writeStructBegin("Airavata_getAllGateways_args");
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->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_isGatewayExist_pargs::~Airavata_isGatewayExist_pargs() throw() {
+Airavata_getAllGateways_pargs::~Airavata_getAllGateways_pargs() throw() {
}
-uint32_t Airavata_isGatewayExist_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGateways_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_isGatewayExist_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getAllGateways_pargs");
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->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
}
-Airavata_isGatewayExist_result::~Airavata_isGatewayExist_result() throw() {
+Airavata_getAllGateways_result::~Airavata_getAllGateways_result() throw() {
}
-uint32_t Airavata_isGatewayExist_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGateways_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2188,8 +2188,20 @@ uint32_t Airavata_isGatewayExist_result::read(::apache::thrift::protocol::TProto
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->success.clear();
+ uint32_t _size11;
+ ::apache::thrift::protocol::TType _etype14;
+ xfer += iprot->readListBegin(_etype14, _size11);
+ this->success.resize(_size11);
+ uint32_t _i15;
+ for (_i15 = 0; _i15 < _size11; ++_i15)
+ {
+ xfer += this->success[_i15].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2239,15 +2251,23 @@ uint32_t Airavata_isGatewayExist_result::read(::apache::thrift::protocol::TProto
return xfer;
}
-uint32_t Airavata_isGatewayExist_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGateways_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_isGatewayExist_result");
+ xfer += oprot->writeStructBegin("Airavata_getAllGateways_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->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::Gateway> ::const_iterator _iter16;
+ for (_iter16 = this->success.begin(); _iter16 != this->success.end(); ++_iter16)
+ {
+ xfer += (*_iter16).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -2272,11 +2292,11 @@ uint32_t Airavata_isGatewayExist_result::write(::apache::thrift::protocol::TProt
}
-Airavata_isGatewayExist_presult::~Airavata_isGatewayExist_presult() throw() {
+Airavata_getAllGateways_presult::~Airavata_getAllGateways_presult() throw() {
}
-uint32_t Airavata_isGatewayExist_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGateways_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2298,8 +2318,20 @@ uint32_t Airavata_isGatewayExist_presult::read(::apache::thrift::protocol::TProt
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ (*(this->success)).clear();
+ uint32_t _size17;
+ ::apache::thrift::protocol::TType _etype20;
+ xfer += iprot->readListBegin(_etype20, _size17);
+ (*(this->success)).resize(_size17);
+ uint32_t _i21;
+ for (_i21 = 0; _i21 < _size17; ++_i21)
+ {
+ xfer += (*(this->success))[_i21].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2350,11 +2382,11 @@ uint32_t Airavata_isGatewayExist_presult::read(::apache::thrift::protocol::TProt
}
-Airavata_createNotification_args::~Airavata_createNotification_args() throw() {
+Airavata_isGatewayExist_args::~Airavata_isGatewayExist_args() throw() {
}
-uint32_t Airavata_createNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_isGatewayExist_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2367,7 +2399,7 @@ uint32_t Airavata_createNotification_args::read(::apache::thrift::protocol::TPro
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_notification = false;
+ bool isset_gatewayId = false;
while (true)
{
@@ -2386,9 +2418,9 @@ uint32_t Airavata_createNotification_args::read(::apache::thrift::protocol::TPro
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->notification.read(iprot);
- isset_notification = true;
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -2404,22 +2436,22 @@ uint32_t Airavata_createNotification_args::read(::apache::thrift::protocol::TPro
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_notification)
+ if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_createNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_isGatewayExist_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_createNotification_args");
+ xfer += oprot->writeStructBegin("Airavata_isGatewayExist_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("notification", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->notification.write(oprot);
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -2428,21 +2460,21 @@ uint32_t Airavata_createNotification_args::write(::apache::thrift::protocol::TPr
}
-Airavata_createNotification_pargs::~Airavata_createNotification_pargs() throw() {
+Airavata_isGatewayExist_pargs::~Airavata_isGatewayExist_pargs() throw() {
}
-uint32_t Airavata_createNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_isGatewayExist_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_createNotification_pargs");
+ xfer += oprot->writeStructBegin("Airavata_isGatewayExist_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("notification", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += (*(this->notification)).write(oprot);
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->gatewayId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -2451,11 +2483,11 @@ uint32_t Airavata_createNotification_pargs::write(::apache::thrift::protocol::TP
}
-Airavata_createNotification_result::~Airavata_createNotification_result() throw() {
+Airavata_isGatewayExist_result::~Airavata_isGatewayExist_result() throw() {
}
-uint32_t Airavata_createNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_isGatewayExist_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2477,8 +2509,8 @@ uint32_t Airavata_createNotification_result::read(::apache::thrift::protocol::TP
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->success);
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2528,15 +2560,15 @@ uint32_t Airavata_createNotification_result::read(::apache::thrift::protocol::TP
return xfer;
}
-uint32_t Airavata_createNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_isGatewayExist_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_createNotification_result");
+ xfer += oprot->writeStructBegin("Airavata_isGatewayExist_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
- xfer += oprot->writeString(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -2561,11 +2593,11 @@ uint32_t Airavata_createNotification_result::write(::apache::thrift::protocol::T
}
-Airavata_createNotification_presult::~Airavata_createNotification_presult() throw() {
+Airavata_isGatewayExist_presult::~Airavata_isGatewayExist_presult() throw() {
}
-uint32_t Airavata_createNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_isGatewayExist_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2587,8 +2619,8 @@ uint32_t Airavata_createNotification_presult::read(::apache::thrift::protocol::T
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2639,11 +2671,11 @@ uint32_t Airavata_createNotification_presult::read(::apache::thrift::protocol::T
}
-Airavata_updateNotification_args::~Airavata_updateNotification_args() throw() {
+Airavata_createNotification_args::~Airavata_createNotification_args() throw() {
}
-uint32_t Airavata_updateNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2698,10 +2730,10 @@ uint32_t Airavata_updateNotification_args::read(::apache::thrift::protocol::TPro
return xfer;
}
-uint32_t Airavata_updateNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateNotification_args");
+ xfer += oprot->writeStructBegin("Airavata_createNotification_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -2717,14 +2749,14 @@ uint32_t Airavata_updateNotification_args::write(::apache::thrift::protocol::TPr
}
-Airavata_updateNotification_pargs::~Airavata_updateNotification_pargs() throw() {
+Airavata_createNotification_pargs::~Airavata_createNotification_pargs() throw() {
}
-uint32_t Airavata_updateNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateNotification_pargs");
+ xfer += oprot->writeStructBegin("Airavata_createNotification_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -2740,11 +2772,11 @@ uint32_t Airavata_updateNotification_pargs::write(::apache::thrift::protocol::TP
}
-Airavata_updateNotification_result::~Airavata_updateNotification_result() throw() {
+Airavata_createNotification_result::~Airavata_createNotification_result() throw() {
}
-uint32_t Airavata_updateNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2766,8 +2798,8 @@ uint32_t Airavata_updateNotification_result::read(::apache::thrift::protocol::TP
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2817,15 +2849,15 @@ uint32_t Airavata_updateNotification_result::read(::apache::thrift::protocol::TP
return xfer;
}
-uint32_t Airavata_updateNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateNotification_result");
+ xfer += oprot->writeStructBegin("Airavata_createNotification_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -2850,11 +2882,11 @@ uint32_t Airavata_updateNotification_result::write(::apache::thrift::protocol::T
}
-Airavata_updateNotification_presult::~Airavata_updateNotification_presult() throw() {
+Airavata_createNotification_presult::~Airavata_createNotification_presult() throw() {
}
-uint32_t Airavata_updateNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2876,8 +2908,8 @@ uint32_t Airavata_updateNotification_presult::read(::apache::thrift::protocol::T
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -2928,11 +2960,11 @@ uint32_t Airavata_updateNotification_presult::read(::apache::thrift::protocol::T
}
-Airavata_deleteNotification_args::~Airavata_deleteNotification_args() throw() {
+Airavata_updateNotification_args::~Airavata_updateNotification_args() throw() {
}
-uint32_t Airavata_deleteNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -2945,8 +2977,7 @@ uint32_t Airavata_deleteNotification_args::read(::apache::thrift::protocol::TPro
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_gatewayId = false;
- bool isset_notificationId = false;
+ bool isset_notification = false;
while (true)
{
@@ -2965,17 +2996,9 @@ uint32_t Airavata_deleteNotification_args::read(::apache::thrift::protocol::TPro
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->notificationId);
- isset_notificationId = true;
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->notification.read(iprot);
+ isset_notification = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -2991,28 +3014,22 @@ uint32_t Airavata_deleteNotification_args::read(::apache::thrift::protocol::TPro
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_notificationId)
+ if (!isset_notification)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_deleteNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteNotification_args");
+ xfer += oprot->writeStructBegin("Airavata_updateNotification_args");
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("notificationId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->notificationId);
+ xfer += oprot->writeFieldBegin("notification", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->notification.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -3021,25 +3038,21 @@ uint32_t Airavata_deleteNotification_args::write(::apache::thrift::protocol::TPr
}
-Airavata_deleteNotification_pargs::~Airavata_deleteNotification_pargs() throw() {
+Airavata_updateNotification_pargs::~Airavata_updateNotification_pargs() throw() {
}
-uint32_t Airavata_deleteNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteNotification_pargs");
+ xfer += oprot->writeStructBegin("Airavata_updateNotification_pargs");
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("notificationId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->notificationId)));
+ xfer += oprot->writeFieldBegin("notification", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += (*(this->notification)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -3048,11 +3061,11 @@ uint32_t Airavata_deleteNotification_pargs::write(::apache::thrift::protocol::TP
}
-Airavata_deleteNotification_result::~Airavata_deleteNotification_result() throw() {
+Airavata_updateNotification_result::~Airavata_updateNotification_result() throw() {
}
-uint32_t Airavata_deleteNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -3125,11 +3138,11 @@ uint32_t Airavata_deleteNotification_result::read(::apache::thrift::protocol::TP
return xfer;
}
-uint32_t Airavata_deleteNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteNotification_result");
+ xfer += oprot->writeStructBegin("Airavata_updateNotification_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -3158,11 +3171,319 @@ uint32_t Airavata_deleteNotification_result::write(::apache::thrift::protocol::T
}
-Airavata_deleteNotification_presult::~Airavata_deleteNotification_presult() throw() {
+Airavata_updateNotification_presult::~Airavata_updateNotification_presult() throw() {
}
-uint32_t Airavata_deleteNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+
+Airavata_deleteNotification_args::~Airavata_deleteNotification_args() throw() {
+}
+
+
+uint32_t Airavata_deleteNotification_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_authzToken = false;
+ bool isset_gatewayId = false;
+ bool isset_notificationId = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->authzToken.read(iprot);
+ isset_authzToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->notificationId);
+ isset_notificationId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_authzToken)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_notificationId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_deleteNotification_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_deleteNotification_args");
+
+ 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("notificationId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->notificationId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_deleteNotification_pargs::~Airavata_deleteNotification_pargs() throw() {
+}
+
+
+uint32_t Airavata_deleteNotification_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("Airavata_deleteNotification_pargs");
+
+ 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("notificationId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString((*(this->notificationId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_deleteNotification_result::~Airavata_deleteNotification_result() throw() {
+}
+
+
+uint32_t Airavata_deleteNotification_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ae.read(iprot);
+ this->__isset.ae = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_deleteNotification_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_deleteNotification_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ae) {
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->ae.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_deleteNotification_presult::~Airavata_deleteNotification_presult() throw() {
+}
+
+
+uint32_t Airavata_deleteNotification_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -3674,14 +3995,14 @@ uint32_t Airavata_getAllNotifications_result::read(::apache::thrift::protocol::T
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size11;
- ::apache::thrift::protocol::TType _etype14;
- xfer += iprot->readListBegin(_etype14, _size11);
- this->success.resize(_size11);
- uint32_t _i15;
- for (_i15 = 0; _i15 < _size11; ++_i15)
+ uint32_t _size22;
+ ::apache::thrift::protocol::TType _etype25;
+ xfer += iprot->readListBegin(_etype25, _size22);
+ this->success.resize(_size22);
+ uint32_t _i26;
+ for (_i26 = 0; _i26 < _size22; ++_i26)
{
- xfer += this->success[_i15].read(iprot);
+ xfer += this->success[_i26].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -3744,10 +4065,10 @@ uint32_t Airavata_getAllNotifications_result::write(::apache::thrift::protocol::
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::Notification> ::const_iterator _iter16;
- for (_iter16 = this->success.begin(); _iter16 != this->success.end(); ++_iter16)
+ std::vector< ::apache::airavata::model::workspace::Notification> ::const_iterator _iter27;
+ for (_iter27 = this->success.begin(); _iter27 != this->success.end(); ++_iter27)
{
- xfer += (*_iter16).write(oprot);
+ xfer += (*_iter27).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -3804,14 +4125,14 @@ uint32_t Airavata_getAllNotifications_presult::read(::apache::thrift::protocol::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size17;
- ::apache::thrift::protocol::TType _etype20;
- xfer += iprot->readListBegin(_etype20, _size17);
- (*(this->success)).resize(_size17);
- uint32_t _i21;
- for (_i21 = 0; _i21 < _size17; ++_i21)
+ uint32_t _size28;
+ ::apache::thrift::protocol::TType _etype31;
+ xfer += iprot->readListBegin(_etype31, _size28);
+ (*(this->success)).resize(_size28);
+ uint32_t _i32;
+ for (_i32 = 0; _i32 < _size28; ++_i32)
{
- xfer += (*(this->success))[_i21].read(iprot);
+ xfer += (*(this->success))[_i32].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -4916,17 +5237,17 @@ uint32_t Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size22;
- ::apache::thrift::protocol::TType _ktype23;
- ::apache::thrift::protocol::TType _vtype24;
- xfer += iprot->readMapBegin(_ktype23, _vtype24, _size22);
- uint32_t _i26;
- for (_i26 = 0; _i26 < _size22; ++_i26)
+ uint32_t _size33;
+ ::apache::thrift::protocol::TType _ktype34;
+ ::apache::thrift::protocol::TType _vtype35;
+ xfer += iprot->readMapBegin(_ktype34, _vtype35, _size33);
+ uint32_t _i37;
+ for (_i37 = 0; _i37 < _size33; ++_i37)
{
- std::string _key27;
- xfer += iprot->readString(_key27);
- std::string& _val28 = this->success[_key27];
- xfer += iprot->readString(_val28);
+ std::string _key38;
+ xfer += iprot->readString(_key38);
+ std::string& _val39 = this->success[_key38];
+ xfer += iprot->readString(_val39);
}
xfer += iprot->readMapEnd();
}
@@ -4981,11 +5302,11 @@ uint32_t Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protoc
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter29;
- for (_iter29 = this->success.begin(); _iter29 != this->success.end(); ++_iter29)
+ std::map<std::string, std::string> ::const_iterator _iter40;
+ for (_iter40 = this->success.begin(); _iter40 != this->success.end(); ++_iter40)
{
- xfer += oprot->writeString(_iter29->first);
- xfer += oprot->writeString(_iter29->second);
+ xfer += oprot->writeString(_iter40->first);
+ xfer += oprot->writeString(_iter40->second);
}
xfer += oprot->writeMapEnd();
}
@@ -5038,17 +5359,17 @@ uint32_t Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size30;
- ::apache::thrift::protocol::TType _ktype31;
- ::apache::thrift::protocol::TType _vtype32;
- xfer += iprot->readMapBegin(_ktype31, _vtype32, _size30);
- uint32_t _i34;
- for (_i34 = 0; _i34 < _size30; ++_i34)
+ uint32_t _size41;
+ ::apache::thrift::protocol::TType _ktype42;
+ ::apache::thrift::protocol::TType _vtype43;
+ xfer += iprot->readMapBegin(_ktype42, _vtype43, _size41);
+ uint32_t _i45;
+ for (_i45 = 0; _i45 < _size41; ++_i45)
{
- std::string _key35;
- xfer += iprot->readString(_key35);
- std::string& _val36 = (*(this->success))[_key35];
- xfer += iprot->readString(_val36);
+ std::string _key46;
+ xfer += iprot->readString(_key46);
+ std::string& _val47 = (*(this->success))[_key46];
+ xfer += iprot->readString(_val47);
}
xfer += iprot->readMapEnd();
}
@@ -5224,17 +5545,17 @@ uint32_t Airavata_getAllGatewayPWDCredentials_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size37;
- ::apache::thrift::protocol::TType _ktype38;
- ::apache::thrift::protocol::TType _vtype39;
- xfer += iprot->readMapBegin(_ktype38, _vtype39, _size37);
- uint32_t _i41;
- for (_i41 = 0; _i41 < _size37; ++_i41)
+ uint32_t _size48;
+ ::apache::thrift::protocol::TType _ktype49;
+ ::apache::thrift::protocol::TType _vtype50;
+ xfer += iprot->readMapBegin(_ktype49, _vtype50, _size48);
+ uint32_t _i52;
+ for (_i52 = 0; _i52 < _size48; ++_i52)
{
- std::string _key42;
- xfer += iprot->readString(_key42);
- std::string& _val43 = this->success[_key42];
- xfer += iprot->readString(_val43);
+ std::string _key53;
+ xfer += iprot->readString(_key53);
+ std::string& _val54 = this->success[_key53];
+ xfer += iprot->readString(_val54);
}
xfer += iprot->readMapEnd();
}
@@ -5289,11 +5610,11 @@ uint32_t Airavata_getAllGatewayPWDCredentials_result::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter44;
- for (_iter44 = this->success.begin(); _iter44 != this->success.end(); ++_iter44)
+ std::map<std::string, std::string> ::const_iterator _iter55;
+ for (_iter55 = this->success.begin(); _iter55 != this->success.end(); ++_iter55)
{
- xfer += oprot->writeString(_iter44->first);
- xfer += oprot->writeString(_iter44->second);
+ xfer += oprot->writeString(_iter55->first);
+ xfer += oprot->writeString(_iter55->second);
}
xfer += oprot->writeMapEnd();
}
@@ -5346,17 +5667,17 @@ uint32_t Airavata_getAllGatewayPWDCredentials_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size45;
- ::apache::thrift::protocol::TType _ktype46;
- ::apache::thrift::protocol::TType _vtype47;
- xfer += iprot->readMapBegin(_ktype46, _vtype47, _size45);
- uint32_t _i49;
- for (_i49 = 0; _i49 < _size45; ++_i49)
+ uint32_t _size56;
+ ::apache::thrift::protocol::TType _ktype57;
+ ::apache::thrift::protocol::TType _vtype58;
+ xfer += iprot->readMapBegin(_ktype57, _vtype58, _size56);
+ uint32_t _i60;
+ for (_i60 = 0; _i60 < _size56; ++_i60)
{
- std::string _key50;
- xfer += iprot->readString(_key50);
- std::string& _val51 = (*(this->success))[_key50];
- xfer += iprot->readString(_val51);
+ std::string _key61;
+ xfer += iprot->readString(_key61);
+ std::string& _val62 = (*(this->success))[_key61];
+ xfer += iprot->readString(_val62);
}
xfer += iprot->readMapEnd();
}
@@ -7399,14 +7720,14 @@ uint32_t Airavata_getUserProjects_result::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size52;
- ::apache::thrift::protocol::TType _etype55;
- xfer += iprot->readListBegin(_etype55, _size52);
- this->success.resize(_size52);
- uint32_t _i56;
- for (_i56 = 0; _i56 < _size52; ++_i56)
+ uint32_t _size63;
+ ::apache::thrift::protocol::TType _etype66;
+ xfer += iprot->readListBegin(_etype66, _size63);
+ this->success.resize(_size63);
+ uint32_t _i67;
+ for (_i67 = 0; _i67 < _size63; ++_i67)
{
- xfer += this->success[_i56].read(iprot);
+ xfer += this->success[_i67].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -7469,10 +7790,10 @@ uint32_t Airavata_getUserProjects_result::write(::apache::thrift::protocol::TPro
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 _iter57;
- for (_iter57 = this->success.begin(); _iter57 != this->success.end(); ++_iter57)
+ std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter68;
+ for (_iter68 = this->success.begin(); _iter68 != this->success.end(); ++_iter68)
{
- xfer += (*_iter57).write(oprot);
+ xfer += (*_iter68).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -7529,14 +7850,14 @@ uint32_t Airavata_getUserProjects_presult::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size58;
- ::apache::thrift::protocol::TType _etype61;
- xfer += iprot->readListBegin(_etype61, _size58);
- (*(this->success)).resize(_size58);
- uint32_t _i62;
- for (_i62 = 0; _i62 < _size58; ++_i62)
+ uint32_t _size69;
+ ::apache::thrift::protocol::TType _etype72;
+ xfer += iprot->readListBegin(_etype72, _size69);
+ (*(this->success)).resize(_size69);
+ uint32_t _i73;
+ for (_i73 = 0; _i73 < _size69; ++_i73)
{
- xfer += (*(this->success))[_i62].read(iprot);
+ xfer += (*(this->success))[_i73].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -7796,14 +8117,14 @@ uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size63;
- ::apache::thrift::protocol::TType _etype66;
- xfer += iprot->readListBegin(_etype66, _size63);
- this->success.resize(_size63);
- uint32_t _i67;
- for (_i67 = 0; _i67 < _size63; ++_i67)
+ uint32_t _size74;
+ ::apache::thrift::protocol::TType _etype77;
+ xfer += iprot->readListBegin(_etype77, _size74);
+ this->success.resize(_size74);
+ uint32_t _i78;
+ for (_i78 = 0; _i78 < _size74; ++_i78)
{
- xfer += this->success[_i67].read(iprot);
+ xfer += this->success[_i78].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -7866,10 +8187,10 @@ uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::pr
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 _iter68;
- for (_iter68 = this->success.begin(); _iter68 != this->success.end(); ++_iter68)
+ std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter79;
+ for (_iter79 = this->success.begin(); _iter79 != this->success.end(); ++_iter79)
{
- xfer += (*_iter68).write(oprot);
+ xfer += (*_iter79).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -7926,14 +8247,14 @@ uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size69;
- ::apache::thrift::protocol::TType _etype72;
- xfer += iprot->readListBegin(_etype72, _size69);
- (*(this->success)).resize(_size69);
- uint32_t _i73;
- for (_i73 = 0; _i73 < _size69; ++_i73)
+ uint32_t _size80;
+ ::apache::thrift::protocol::TType _etype83;
+ xfer += iprot->readListBegin(_etype83, _size80);
+ (*(this->success)).resize(_size80);
+ uint32_t _i84;
+ for (_i84 = 0; _i84 < _size80; ++_i84)
{
- xfer += (*(this->success))[_i73].read(iprot);
+ xfer += (*(this->success))[_i84].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8193,14 +8514,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size74;
- ::apache::thrift::protocol::TType _etype77;
- xfer += iprot->readListBegin(_etype77, _size74);
- this->success.resize(_size74);
- uint32_t _i78;
- for (_i78 = 0; _i78 < _size74; ++_i78)
+ uint32_t _size85;
+ ::apache::thrift::protocol::TType _etype88;
+ xfer += iprot->readListBegin(_etype88, _size85);
+ this->success.resize(_size85);
+ uint32_t _i89;
+ for (_i89 = 0; _i89 < _size85; ++_i89)
{
- xfer += this->success[_i78].read(iprot);
+ xfer += this->success[_i89].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8263,10 +8584,10 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::pr
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 _iter79;
- for (_iter79 = this->success.begin(); _iter79 != this->success.end(); ++_iter79)
+ std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter90;
+ for (_iter90 = this->success.begin(); _iter90 != this->success.end(); ++_iter90)
{
- xfer += (*_iter79).write(oprot);
+ xfer += (*_iter90).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -8323,14 +8644,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size80;
- ::apache::thrift::protocol::TType _etype83;
- xfer += iprot->readListBegin(_etype83, _size80);
- (*(this->success)).resize(_size80);
- uint32_t _i84;
- for (_i84 = 0; _i84 < _size80; ++_i84)
+ uint32_t _size91;
+ ::apache::thrift::protocol::TType _etype94;
+ xfer += iprot->readListBegin(_etype94, _size91);
+ (*(this->success)).resize(_size91);
+ uint32_t _i95;
+ for (_i95 = 0; _i95 < _size91; ++_i95)
{
- xfer += (*(this->success))[_i84].read(iprot);
+ xfer += (*(this->success))[_i95].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8590,14 +8911,14 @@ uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size85;
- ::apache::thrift::protocol::TType _etype88;
- xfer += iprot->readListBegin(_etype88, _size85);
- this->success.resize(_size85);
- uint32_t _i89;
- for (_i89 = 0; _i89 < _size85; ++_i89)
+ uint32_t _size96;
+ ::apache::thrift::protocol::TType _etype99;
+ xfer += iprot->readListBegin(_etype99, _size96);
+ this->success.resize(_size96);
+ uint32_t _i100;
+ for (_i100 = 0; _i100 < _size96; ++_i100)
{
- xfer += this->success[_i89].read(iprot);
+ xfer += this->success[_i100].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8660,10 +8981,10 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
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 _iter90;
- for (_iter90 = this->success.begin(); _iter90 != this->success.end(); ++_iter90)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter101;
+ for (_iter101 = this->success.begin(); _iter101 != this->success.end(); ++_iter101)
{
- xfer += (*_iter90).write(oprot);
+ xfer += (*_iter101).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -8720,14 +9041,14 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size91;
- ::apache::thrift::protocol::TType _etype94;
- xfer += iprot->readListBegin(_etype94, _size91);
- (*(this->success)).resize(_size91);
- uint32_t _i95;
- for (_i95 = 0; _i95 < _size91; ++_i95)
+ uint32_t _size102;
+ ::apache::thrift::protocol::TType _etype105;
+ xfer += iprot->readListBegin(_etype105, _size102);
+ (*(this->success)).resize(_size102);
+ uint32_t _i106;
+ for (_i106 = 0; _i106 < _size102; ++_i106)
{
- xfer += (*(this->success))[_i95].read(iprot);
+ xfer += (*(this->success))[_i106].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8987,14 +9308,14 @@ uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size96;
- ::apache::thrift::protocol::TType _etype99;
- xfer += iprot->readListBegin(_etype99, _size96);
- this->success.resize(_size96);
- uint32_t _i100;
- for (_i100 = 0; _i100 < _size96; ++_i100)
+ uint32_t _size107;
+ ::apache::thrift::protocol::TType _etype110;
+ xfer += iprot->readListBegin(_etype110, _size107);
+ this->success.resize(_size107);
+ uint32_t _i111;
+ for (_i111 = 0; _i111 < _size107; ++_i111)
{
- xfer += this->success[_i100].read(iprot);
+ xfer += this->success[_i111].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9057,10 +9378,10 @@ uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protoc
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 _iter101;
- for (_iter101 = this->success.begin(); _iter101 != this->success.end(); ++_iter101)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter112;
+ for (_iter112 = this->success.begin(); _iter112 != this->success.end(); ++_iter112)
{
- xfer += (*_iter101).write(oprot);
+ xfer += (*_iter112).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9117,14 +9438,14 @@ uint32_t Airavata_searchExperimentsByDesc_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size102;
- ::apache::thrift::protocol::TType _etype105;
- xfer += iprot->readListBegin(_etype105, _size102);
- (*(this->success)).resize(_size102);
- uint32_t _i106;
- for (_i106 = 0; _i106 < _size102; ++_i106)
+ uint32_t _size113;
+ ::apache::thrift::protocol::TType _etype116;
+ xfer += iprot->readListBegin(_etype116, _size113);
+ (*(this->success)).resize(_size113);
+ uint32_t _i117;
+ for (_i117 = 0; _i117 < _size113; ++_i117)
{
- xfer += (*(this->success))[_i106].read(iprot);
+ xfer += (*(this->success))[_i117].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9384,14 +9705,14 @@ uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size107;
- ::apache::thrift::protocol::TType _etype110;
- xfer += iprot->readListBegin(_etype110, _size107);
- this->success.resize(_size107);
- uint32_t _i111;
- for (_i111 = 0; _i111 < _size107; ++_i111)
+ uint32_t _size118;
+ ::apache::thrift::protocol::TType _etype121;
+ xfer += iprot->readListBegin(_etype121, _size118);
+ this->success.resize(_size118);
+ uint32_t _i122;
+ for (_i122 = 0; _i122 < _size118; ++_i122)
{
- xfer += this->success[_i111].read(iprot);
+ xfer += this->success[_i122].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9454,10 +9775,10 @@ uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift:
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 _iter112;
- for (_iter112 = this->success.begin(); _iter112 != this->success.end(); ++_iter112)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter123;
+ for (_iter123 = this->success.begin(); _iter123 != this->success.end(); ++_iter123)
{
- xfer += (*_iter112).write(oprot);
+ xfer += (*_iter123).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9514,14 +9835,14 @@ uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size113;
- ::apache::thrift::protocol::TType _etype11
<TRUNCATED>
[34/53] [abbrv] airavata git commit: test
Posted by sh...@apache.org.
test
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ad6b5257
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ad6b5257
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ad6b5257
Branch: refs/heads/master
Commit: ad6b5257ac315e98adfd7df44f7e99d79654dafd
Parents: 35d0706
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 18:26:29 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 18:26:29 2016 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ad6b5257/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 94768b4..7310d1a 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
@@ -74,6 +74,7 @@ import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
+import org.apache.airavata.registry.core.experiment.catalog.model.ExperimentSummary;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.thrift.TException;
@@ -893,9 +894,13 @@ public class AiravataServerHandler implements Airavata.Iface {
}
//FIXME
- List<ExperimentModel> allUserExperiments = getUserExperiments(authzToken, gatewayId, userName, -1, 0);
+ Map<String, String> temp = new HashMap();
+ temp.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
+ temp.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
+ List<Object> allUserExperiments = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, temp, -1,
+ 0, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
List<String> accessibleExpIds = new ArrayList<>();
- allUserExperiments.stream().forEach(e->accessibleExpIds.add(e.getExperimentId()));
+ allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummary)e).getExperimentId()));
List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.EXPERIMENT,
accessibleExpIds, regFilters, limit,
[14/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 e29b37d..3398826 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
@@ -578,188 +578,6 @@ interface AiravataIf {
*/
public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
/**
- *
- * Search User Experiments by Name
- * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user who created the experiments.
- *
- * @param expName
- * Experiment name to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param string $expName
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset);
- /**
- *
- * Search By Experiment Description
- * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @param description
- * Experiment description to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param string $description
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
- /**
- *
- * Search Experiment By the Application
- * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @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.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param string $applicationId
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
- /**
- *
- * Search User Experiments by Status
- * Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user making the request.
- *
- * @param experimentState
- * Experiement state to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param int $experimentState
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
- /**
- *
- * Search User Experiments by the Creation Time
- * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique 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.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- * @return ExperimentSummaryModel
- * List of experiments for the given search filter. Here only the Experiment summary will be returned.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param int $fromTime
- * @param int $toTime
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
- /**
* Search Experiments.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
*
@@ -5392,39 +5210,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("searchProjectsByProjectDesc failed: unknown result");
}
- public function searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
+ public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $this->send_searchExperimentsByName($authzToken, $gatewayId, $userName, $expName, $limit, $offset);
- return $this->recv_searchExperimentsByName();
+ $this->send_searchExperiments($authzToken, $gatewayId, $userName, $filters, $limit, $offset);
+ return $this->recv_searchExperiments();
}
- public function send_searchExperimentsByName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $expName, $limit, $offset)
+ public function send_searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByName_args();
+ $args = new \Airavata\API\Airavata_searchExperiments_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
- $args->expName = $expName;
+ $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_, 'searchExperimentsByName', 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('searchExperimentsByName', 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_searchExperimentsByName()
+ 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_searchExperimentsByName_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;
@@ -5438,7 +5256,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByName_result();
+ $result = new \Airavata\API\Airavata_searchExperiments_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5457,42 +5275,40 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByName failed: unknown result");
+ throw new \Exception("searchExperiments failed: unknown result");
}
- public function searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
+ public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
{
- $this->send_searchExperimentsByDesc($authzToken, $gatewayId, $userName, $description, $limit, $offset);
- return $this->recv_searchExperimentsByDesc();
+ $this->send_getExperimentStatistics($authzToken, $gatewayId, $fromTime, $toTime);
+ return $this->recv_getExperimentStatistics();
}
- public function send_searchExperimentsByDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
+ public function send_getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByDesc_args();
+ $args = new \Airavata\API\Airavata_getExperimentStatistics_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->description = $description;
- $args->limit = $limit;
- $args->offset = $offset;
+ $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_, 'searchExperimentsByDesc', 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('searchExperimentsByDesc', 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_searchExperimentsByDesc()
+ 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_searchExperimentsByDesc_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;
@@ -5506,7 +5322,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByDesc_result();
+ $result = new \Airavata\API\Airavata_getExperimentStatistics_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5525,42 +5341,40 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByDesc failed: unknown result");
+ throw new \Exception("getExperimentStatistics failed: unknown result");
}
- public function searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
+ public function getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
{
- $this->send_searchExperimentsByApplication($authzToken, $gatewayId, $userName, $applicationId, $limit, $offset);
- return $this->recv_searchExperimentsByApplication();
+ $this->send_getExperimentsInProject($authzToken, $projectId, $limit, $offset);
+ return $this->recv_getExperimentsInProject();
}
- public function send_searchExperimentsByApplication(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $applicationId, $limit, $offset)
+ public function send_getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByApplication_args();
+ $args = new \Airavata\API\Airavata_getExperimentsInProject_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->applicationId = $applicationId;
+ $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_, 'searchExperimentsByApplication', 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('searchExperimentsByApplication', 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_searchExperimentsByApplication()
+ 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_searchExperimentsByApplication_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;
@@ -5574,7 +5388,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByApplication_result();
+ $result = new \Airavata\API\Airavata_getExperimentsInProject_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5590,45 +5404,47 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
+ if ($result->pnfe !== null) {
+ throw $result->pnfe;
+ }
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByApplication failed: unknown result");
+ throw new \Exception("getExperimentsInProject failed: unknown result");
}
- public function searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
+ public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $this->send_searchExperimentsByStatus($authzToken, $gatewayId, $userName, $experimentState, $limit, $offset);
- return $this->recv_searchExperimentsByStatus();
+ $this->send_getUserExperiments($authzToken, $gatewayId, $userName, $limit, $offset);
+ return $this->recv_getUserExperiments();
}
- public function send_searchExperimentsByStatus(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $experimentState, $limit, $offset)
+ public function send_getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByStatus_args();
+ $args = new \Airavata\API\Airavata_getUserExperiments_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
$args->userName = $userName;
- $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_, 'searchExperimentsByStatus', 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('searchExperimentsByStatus', 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_searchExperimentsByStatus()
+ 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_searchExperimentsByStatus_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;
@@ -5642,7 +5458,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByStatus_result();
+ $result = new \Airavata\API\Airavata_getUserExperiments_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5661,43 +5477,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByStatus failed: unknown result");
+ throw new \Exception("getUserExperiments failed: unknown result");
}
- public function searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
+ public function createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $this->send_searchExperimentsByCreationTime($authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset);
- return $this->recv_searchExperimentsByCreationTime();
+ $this->send_createExperiment($authzToken, $gatewayId, $experiment);
+ return $this->recv_createExperiment();
}
- public function send_searchExperimentsByCreationTime(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $fromTime, $toTime, $limit, $offset)
+ public function send_createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $args = new \Airavata\API\Airavata_searchExperimentsByCreationTime_args();
+ $args = new \Airavata\API\Airavata_createExperiment_args();
$args->authzToken = $authzToken;
$args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->fromTime = $fromTime;
- $args->toTime = $toTime;
- $args->limit = $limit;
- $args->offset = $offset;
+ $args->experiment = $experiment;
$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_, 'createExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperimentsByCreationTime', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('createExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperimentsByCreationTime()
+ public function recv_createExperiment()
{
$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_createExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5711,7 +5523,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperimentsByCreationTime_result();
+ $result = new \Airavata\API\Airavata_createExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5730,42 +5542,38 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperimentsByCreationTime failed: unknown result");
+ throw new \Exception("createExperiment failed: unknown result");
}
- public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
+ public function deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId)
{
- $this->send_searchExperiments($authzToken, $gatewayId, $userName, $filters, $limit, $offset);
- return $this->recv_searchExperiments();
+ $this->send_deleteExperiment($authzToken, $experimentId);
+ return $this->recv_deleteExperiment();
}
- public function send_searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
+ public function send_deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId)
{
- $args = new \Airavata\API\Airavata_searchExperiments_args();
+ $args = new \Airavata\API\Airavata_deleteExperiment_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->filters = $filters;
- $args->limit = $limit;
- $args->offset = $offset;
+ $args->experimentId = $experimentId;
$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());
+ thrift_protocol_write_binary($this->output_, 'deleteExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchExperiments', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('deleteExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchExperiments()
+ public function recv_deleteExperiment()
{
$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());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5779,7 +5587,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchExperiments_result();
+ $result = new \Airavata\API\Airavata_deleteExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5798,40 +5606,38 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchExperiments failed: unknown result");
+ throw new \Exception("deleteExperiment failed: unknown result");
}
- public function getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
+ public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_getExperimentStatistics($authzToken, $gatewayId, $fromTime, $toTime);
- return $this->recv_getExperimentStatistics();
+ $this->send_getExperiment($authzToken, $airavataExperimentId);
+ return $this->recv_getExperiment();
}
- public function send_getExperimentStatistics(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $fromTime, $toTime)
+ public function send_getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_getExperimentStatistics_args();
+ $args = new \Airavata\API\Airavata_getExperiment_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->fromTime = $fromTime;
- $args->toTime = $toTime;
+ $args->airavataExperimentId = $airavataExperimentId;
$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());
+ thrift_protocol_write_binary($this->output_, 'getExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getExperimentStatistics', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getExperimentStatistics()
+ public function recv_getExperiment()
{
$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());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5845,7 +5651,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getExperimentStatistics_result();
+ $result = new \Airavata\API\Airavata_getExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5855,6 +5661,9 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ire !== null) {
throw $result->ire;
}
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
if ($result->ace !== null) {
throw $result->ace;
}
@@ -5864,40 +5673,38 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getExperimentStatistics failed: unknown result");
+ throw new \Exception("getExperiment failed: unknown result");
}
- public function getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_getExperimentsInProject($authzToken, $projectId, $limit, $offset);
- return $this->recv_getExperimentsInProject();
+ $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId);
+ return $this->recv_getDetailedExperimentTree();
}
- public function send_getExperimentsInProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, $limit, $offset)
+ public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_getExperimentsInProject_args();
+ $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args();
$args->authzToken = $authzToken;
- $args->projectId = $projectId;
- $args->limit = $limit;
- $args->offset = $offset;
+ $args->airavataExperimentId = $airavataExperimentId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getExperimentsInProject', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getExperimentsInProject', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getExperimentsInProject()
+ public function recv_getDetailedExperimentTree()
{
$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_getExperimentsInProject_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getDetailedExperimentTree_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5911,7 +5718,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getExperimentsInProject_result();
+ $result = new \Airavata\API\Airavata_getDetailedExperimentTree_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5921,53 +5728,51 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ire !== null) {
throw $result->ire;
}
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
if ($result->ace !== null) {
throw $result->ace;
}
if ($result->ase !== null) {
throw $result->ase;
}
- if ($result->pnfe !== null) {
- throw $result->pnfe;
- }
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getExperimentsInProject failed: unknown result");
+ throw new \Exception("getDetailedExperimentTree failed: unknown result");
}
- public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
+ public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $this->send_getUserExperiments($authzToken, $gatewayId, $userName, $limit, $offset);
- return $this->recv_getUserExperiments();
+ $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
+ $this->recv_updateExperiment();
}
- public function send_getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset)
+ public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $args = new \Airavata\API\Airavata_getUserExperiments_args();
+ $args = new \Airavata\API\Airavata_updateExperiment_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->userName = $userName;
- $args->limit = $limit;
- $args->offset = $offset;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $args->experiment = $experiment;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getUserExperiments', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getUserExperiments', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getUserExperiments()
+ public function recv_updateExperiment()
{
$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_getUserExperiments_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5981,16 +5786,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getUserExperiments_result();
+ $result = new \Airavata\API\Airavata_updateExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->success !== null) {
- return $result->success;
- }
if ($result->ire !== null) {
throw $result->ire;
}
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
if ($result->ace !== null) {
throw $result->ace;
}
@@ -6000,39 +5805,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getUserExperiments failed: unknown result");
+ return;
}
- public function createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $this->send_createExperiment($authzToken, $gatewayId, $experiment);
- return $this->recv_createExperiment();
+ $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
+ $this->recv_updateExperimentConfiguration();
}
- public function send_createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $args = new \Airavata\API\Airavata_createExperiment_args();
+ $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
$args->authzToken = $authzToken;
- $args->gatewayId = $gatewayId;
- $args->experiment = $experiment;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $args->userConfiguration = $userConfiguration;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'createExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('createExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_createExperiment()
+ public function recv_updateExperimentConfiguration()
{
$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_createExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperimentConfiguration_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -6046,57 +5851,46 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_createExperiment_result();
+ $result = new \Airavata\API\Airavata_updateExperimentConfiguration_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("createExperiment failed: unknown result");
+ return;
}
- public function deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId)
+ public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
- $this->send_deleteExperiment($authzToken, $experimentId);
- return $this->recv_deleteExperiment();
+ $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
+ $this->recv_updateResourceScheduleing();
}
- public function send_deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId)
+ public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
- $args = new \Airavata\API\Airavata_deleteExperiment_args();
+ $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
$args->authzToken = $authzToken;
- $args->experimentId = $experimentId;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $args->resourceScheduling = $resourceScheduling;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'deleteExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('deleteExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_deleteExperiment()
+ public function recv_updateResourceScheduleing()
{
$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_deleteExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateResourceScheduleing_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -6110,57 +5904,45 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_deleteExperiment_result();
+ $result = new \Airavata\API\Airavata_updateResourceScheduleing_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("deleteExperiment failed: unknown result");
+ return;
}
- public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_getExperiment($authzToken, $airavataExperimentId);
- return $this->recv_getExperiment();
+ $this->send_validateExperiment($authzToken, $airavataExperimentId);
+ return $this->recv_validateExperiment();
}
- public function send_getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_getExperiment_args();
+ $args = new \Airavata\API\Airavata_validateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getExperiment()
+ public function recv_validateExperiment()
{
$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_getExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_validateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -6174,312 +5956,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getExperiment_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- throw new \Exception("getExperiment failed: unknown result");
- }
-
- public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId);
- return $this->recv_getDetailedExperimentTree();
- }
-
- public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getDetailedExperimentTree()
- {
- $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_getDetailedExperimentTree_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_getDetailedExperimentTree_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- throw new \Exception("getDetailedExperimentTree failed: unknown result");
- }
-
- public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
- {
- $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
- $this->recv_updateExperiment();
- }
-
- public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
- {
- $args = new \Airavata\API\Airavata_updateExperiment_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $args->experiment = $experiment;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_updateExperiment()
- {
- $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_updateExperiment_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_updateExperiment_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- return;
- }
-
- public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
- {
- $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
- $this->recv_updateExperimentConfiguration();
- }
-
- public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
- {
- $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $args->userConfiguration = $userConfiguration;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_updateExperimentConfiguration()
- {
- $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_updateExperimentConfiguration_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_updateExperimentConfiguration_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- return;
- }
-
- public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
- {
- $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
- $this->recv_updateResourceScheduleing();
- }
-
- public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
- {
- $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $args->resourceScheduling = $resourceScheduling;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_updateResourceScheduleing()
- {
- $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_updateResourceScheduleing_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_updateResourceScheduleing_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- return;
- }
-
- public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $this->send_validateExperiment($authzToken, $airavataExperimentId);
- return $this->recv_validateExperiment();
- }
-
- public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $args = new \Airavata\API\Airavata_validateExperiment_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_validateExperiment()
- {
- $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_validateExperiment_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_validateExperiment_result();
+ $result = new \Airavata\API\Airavata_validateExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -20147,1951 +19624,7 @@ class Airavata_deleteProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteProject_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->projectId !== null) {
- $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
- $xfer += $output->writeString($this->projectId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_deleteProject_result {
- static $_TSPEC;
-
- /**
- * @var bool
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\ProjectNotFoundException
- */
- public $pnfe = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::BOOL,
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'pnfe',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ProjectNotFoundException',
- ),
- 5 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['pnfe'])) {
- $this->pnfe = $vals['pnfe'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_deleteProject_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
- $xfer += $this->pnfe->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteProject_result');
- if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->pnfe !== null) {
- $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
- $xfer += $this->pnfe->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getUserProjects_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @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,
- ),
- 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_getUserProjects_args';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- 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;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $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, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- 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;
- }
-
-}
-
-class Airavata_getUserProjects_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProjects_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size39 = 0;
- $_etype42 = 0;
- $xfer += $input->readListBegin($_etype42, $_size39);
- for ($_i43 = 0; $_i43 < $_size39; ++$_i43)
- {
- $elem44 = null;
- $elem44 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem44->read($input);
- $this->success []= $elem44;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $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);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter45)
- {
- $xfer += $iter45->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $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;
- }
-
-}
-
-class Airavata_searchProjectsByProjectName_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $projectName = 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,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'projectName',
- '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['limit'])) {
- $this->limit = $vals['limit'];
- }
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchProjectsByProjectName_args';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- 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 6:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->offset);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $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);
- }
- $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, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- 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, 5);
- $xfer += $output->writeI32($this->limit);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
- $xfer += $output->writeI32($this->offset);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_searchProjectsByProjectName_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchProjectsByProjectName_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
- {
- $elem51 = null;
- $elem51 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem51->read($input);
- $this->success []= $elem51;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $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);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter52)
- {
- $xfer += $iter52->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !
<TRUNCATED>
[04/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 8a3cc2c..e29b37d 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
@@ -71,6 +71,26 @@ interface AiravataIf {
*/
public function addGateway(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Workspace\Gateway $gateway);
/**
+ * Get all users in the gateway
+ *
+ * @param gatewayId
+ * The gateway data model.
+ *
+ * @return users
+ * list of usernames of the users in the gateway
+ *
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $gatewayId
+ * @return string[]
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getAllUsersInGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
+ /**
* Update previously registered Gateway metadata.
*
* @param gatewayId
@@ -3767,6 +3787,70 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addGateway failed: unknown result");
}
+ public function getAllUsersInGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId)
+ {
+ $this->send_getAllUsersInGateway($authzToken, $gatewayId);
+ return $this->recv_getAllUsersInGateway();
+ }
+
+ public function send_getAllUsersInGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId)
+ {
+ $args = new \Airavata\API\Airavata_getAllUsersInGateway_args();
+ $args->authzToken = $authzToken;
+ $args->gatewayId = $gatewayId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getAllUsersInGateway', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getAllUsersInGateway', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getAllUsersInGateway()
+ {
+ $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_getAllUsersInGateway_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_getAllUsersInGateway_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("getAllUsersInGateway failed: unknown result");
+ }
+
public function updateGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Gateway $updatedGateway)
{
$this->send_updateGateway($authzToken, $gatewayId, $updatedGateway);
@@ -13865,7 +13949,7 @@ class Airavata_addGateway_result {
}
-class Airavata_updateGateway_args {
+class Airavata_getAllUsersInGateway_args {
static $_TSPEC;
/**
@@ -13876,10 +13960,6 @@ class Airavata_updateGateway_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $updatedGateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13893,11 +13973,6 @@ class Airavata_updateGateway_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'updatedGateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
);
}
if (is_array($vals)) {
@@ -13907,14 +13982,11 @@ class Airavata_updateGateway_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['updatedGateway'])) {
- $this->updatedGateway = $vals['updatedGateway'];
- }
}
}
public function getName() {
- return 'Airavata_updateGateway_args';
+ return 'Airavata_getAllUsersInGateway_args';
}
public function read($input)
@@ -13947,14 +14019,6 @@ class Airavata_updateGateway_args {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->updatedGateway->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13967,7 +14031,7 @@ class Airavata_updateGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13981,14 +14045,6 @@ class Airavata_updateGateway_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->updatedGateway !== null) {
- if (!is_object($this->updatedGateway)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
- $xfer += $this->updatedGateway->write($output);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13996,10 +14052,14 @@ class Airavata_updateGateway_args {
}
-class Airavata_updateGateway_result {
+class Airavata_getAllUsersInGateway_result {
static $_TSPEC;
/**
+ * @var string[]
+ */
+ public $success = null;
+ /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -14019,6 +14079,14 @@ class Airavata_updateGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::LST,
+ 'etype' => TType::STRING,
+ 'elem' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -14042,6 +14110,9 @@ class Airavata_updateGateway_result {
);
}
if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -14058,7 +14129,7 @@ class Airavata_updateGateway_result {
}
public function getName() {
- return 'Airavata_updateGateway_result';
+ return 'Airavata_getAllUsersInGateway_result';
}
public function read($input)
@@ -14076,6 +14147,23 @@ class Airavata_updateGateway_result {
}
switch ($fid)
{
+ case 0:
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $xfer += $input->readString($elem5);
+ $this->success []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -14120,7 +14208,24 @@ class Airavata_updateGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllUsersInGateway_result');
+ if ($this->success !== null) {
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRING, count($this->success));
+ {
+ foreach ($this->success as $iter6)
+ {
+ $xfer += $output->writeString($iter6);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -14148,7 +14253,7 @@ class Airavata_updateGateway_result {
}
-class Airavata_getGateway_args {
+class Airavata_updateGateway_args {
static $_TSPEC;
/**
@@ -14159,6 +14264,10 @@ class Airavata_getGateway_args {
* @var string
*/
public $gatewayId = null;
+ /**
+ * @var \Airavata\Model\Workspace\Gateway
+ */
+ public $updatedGateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14172,6 +14281,11 @@ class Airavata_getGateway_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
+ 3 => array(
+ 'var' => 'updatedGateway',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
);
}
if (is_array($vals)) {
@@ -14181,11 +14295,14 @@ class Airavata_getGateway_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['updatedGateway'])) {
+ $this->updatedGateway = $vals['updatedGateway'];
+ }
}
}
public function getName() {
- return 'Airavata_getGateway_args';
+ return 'Airavata_updateGateway_args';
}
public function read($input)
@@ -14218,6 +14335,14 @@ class Airavata_getGateway_args {
$xfer += $input->skip($ftype);
}
break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->updatedGateway->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14230,7 +14355,7 @@ class Airavata_getGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14244,6 +14369,14 @@ class Airavata_getGateway_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->updatedGateway !== null) {
+ if (!is_object($this->updatedGateway)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
+ $xfer += $this->updatedGateway->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14251,14 +14384,10 @@ class Airavata_getGateway_args {
}
-class Airavata_getGateway_result {
+class Airavata_updateGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $success = null;
- /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -14278,11 +14407,6 @@ class Airavata_getGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -14306,9 +14430,6 @@ class Airavata_getGateway_result {
);
}
if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -14325,7 +14446,7 @@ class Airavata_getGateway_result {
}
public function getName() {
- return 'Airavata_getGateway_result';
+ return 'Airavata_updateGateway_result';
}
public function read($input)
@@ -14343,14 +14464,6 @@ class Airavata_getGateway_result {
}
switch ($fid)
{
- case 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->success->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -14395,15 +14508,7 @@ class Airavata_getGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_result');
- if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
- $xfer += $output->writeFieldEnd();
- }
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -14431,7 +14536,7 @@ class Airavata_getGateway_result {
}
-class Airavata_deleteGateway_args {
+class Airavata_getGateway_args {
static $_TSPEC;
/**
@@ -14468,7 +14573,7 @@ class Airavata_deleteGateway_args {
}
public function getName() {
- return 'Airavata_deleteGateway_args';
+ return 'Airavata_getGateway_args';
}
public function read($input)
@@ -14513,7 +14618,7 @@ class Airavata_deleteGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14534,11 +14639,11 @@ class Airavata_deleteGateway_args {
}
-class Airavata_deleteGateway_result {
+class Airavata_getGateway_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway
*/
public $success = null;
/**
@@ -14563,7 +14668,8 @@ class Airavata_deleteGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
),
1 => array(
'var' => 'ire',
@@ -14607,7 +14713,7 @@ class Airavata_deleteGateway_result {
}
public function getName() {
- return 'Airavata_deleteGateway_result';
+ return 'Airavata_getGateway_result';
}
public function read($input)
@@ -14626,8 +14732,9 @@ class Airavata_deleteGateway_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -14676,10 +14783,13 @@ class Airavata_deleteGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_object($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14709,13 +14819,17 @@ class Airavata_deleteGateway_result {
}
-class Airavata_getAllGateways_args {
+class Airavata_deleteGateway_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14725,17 +14839,24 @@ class Airavata_getAllGateways_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllGateways_args';
+ return 'Airavata_deleteGateway_args';
}
public function read($input)
@@ -14761,6 +14882,13 @@ class Airavata_getAllGateways_args {
$xfer += $input->skip($ftype);
}
break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14773,7 +14901,7 @@ class Airavata_getAllGateways_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14782,6 +14910,11 @@ class Airavata_getAllGateways_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -14789,11 +14922,11 @@ class Airavata_getAllGateways_args {
}
-class Airavata_getAllGateways_result {
+class Airavata_deleteGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway[]
+ * @var bool
*/
public $success = null;
/**
@@ -14818,12 +14951,7 @@ class Airavata_getAllGateways_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -14867,7 +14995,7 @@ class Airavata_getAllGateways_result {
}
public function getName() {
- return 'Airavata_getAllGateways_result';
+ return 'Airavata_deleteGateway_result';
}
public function read($input)
@@ -14886,19 +15014,8 @@ class Airavata_getAllGateways_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
- {
- $elem5 = null;
- $elem5 = new \Airavata\Model\Workspace\Gateway();
- $xfer += $elem5->read($input);
- $this->success []= $elem5;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -14947,22 +15064,10 @@ class Airavata_getAllGateways_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter6)
- {
- $xfer += $iter6->write($output);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14992,17 +15097,13 @@ class Airavata_getAllGateways_result {
}
-class Airavata_isGatewayExist_args {
+class Airavata_getAllGateways_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15012,24 +15113,17 @@ class Airavata_isGatewayExist_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
public function getName() {
- return 'Airavata_isGatewayExist_args';
+ return 'Airavata_getAllGateways_args';
}
public function read($input)
@@ -15055,13 +15149,6 @@ class Airavata_isGatewayExist_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -15074,7 +15161,7 @@ class Airavata_isGatewayExist_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15083,11 +15170,6 @@ class Airavata_isGatewayExist_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -15095,11 +15177,11 @@ class Airavata_isGatewayExist_args {
}
-class Airavata_isGatewayExist_result {
+class Airavata_getAllGateways_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway[]
*/
public $success = null;
/**
@@ -15124,7 +15206,12 @@ class Airavata_isGatewayExist_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
),
1 => array(
'var' => 'ire',
@@ -15168,7 +15255,7 @@ class Airavata_isGatewayExist_result {
}
public function getName() {
- return 'Airavata_isGatewayExist_result';
+ return 'Airavata_getAllGateways_result';
}
public function read($input)
@@ -15187,8 +15274,19 @@ class Airavata_isGatewayExist_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readListBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $elem12 = null;
+ $elem12 = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $elem12->read($input);
+ $this->success []= $elem12;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -15237,10 +15335,22 @@ class Airavata_isGatewayExist_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter13)
+ {
+ $xfer += $iter13->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15270,7 +15380,7 @@ class Airavata_isGatewayExist_result {
}
-class Airavata_createNotification_args {
+class Airavata_isGatewayExist_args {
static $_TSPEC;
/**
@@ -15278,9 +15388,9 @@ class Airavata_createNotification_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Workspace\Notification
+ * @var string
*/
- public $notification = null;
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15291,9 +15401,8 @@ class Airavata_createNotification_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'notification',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Notification',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
),
);
}
@@ -15301,14 +15410,14 @@ class Airavata_createNotification_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['notification'])) {
- $this->notification = $vals['notification'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
}
}
public function getName() {
- return 'Airavata_createNotification_args';
+ return 'Airavata_isGatewayExist_args';
}
public function read($input)
@@ -15335,9 +15444,8 @@ class Airavata_createNotification_args {
}
break;
case 2:
- if ($ftype == TType::STRUCT) {
- $this->notification = new \Airavata\Model\Workspace\Notification();
- $xfer += $this->notification->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -15354,7 +15462,7 @@ class Airavata_createNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15363,12 +15471,9 @@ class Airavata_createNotification_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->notification !== null) {
- if (!is_object($this->notification)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('notification', TType::STRUCT, 2);
- $xfer += $this->notification->write($output);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -15378,11 +15483,11 @@ class Airavata_createNotification_args {
}
-class Airavata_createNotification_result {
+class Airavata_isGatewayExist_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -15407,7 +15512,7 @@ class Airavata_createNotification_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -15451,7 +15556,7 @@ class Airavata_createNotification_result {
}
public function getName() {
- return 'Airavata_createNotification_result';
+ return 'Airavata_isGatewayExist_result';
}
public function read($input)
@@ -15470,8 +15575,8 @@ class Airavata_createNotification_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -15520,10 +15625,10 @@ class Airavata_createNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15553,7 +15658,7 @@ class Airavata_createNotification_result {
}
-class Airavata_updateNotification_args {
+class Airavata_createNotification_args {
static $_TSPEC;
/**
@@ -15591,7 +15696,7 @@ class Airavata_updateNotification_args {
}
public function getName() {
- return 'Airavata_updateNotification_args';
+ return 'Airavata_createNotification_args';
}
public function read($input)
@@ -15637,7 +15742,7 @@ class Airavata_updateNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_createNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15661,11 +15766,11 @@ class Airavata_updateNotification_args {
}
-class Airavata_updateNotification_result {
+class Airavata_createNotification_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -15690,7 +15795,7 @@ class Airavata_updateNotification_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -15734,7 +15839,7 @@ class Airavata_updateNotification_result {
}
public function getName() {
- return 'Airavata_updateNotification_result';
+ return 'Airavata_createNotification_result';
}
public function read($input)
@@ -15753,8 +15858,8 @@ class Airavata_updateNotification_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -15803,10 +15908,10 @@ class Airavata_updateNotification_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateNotification_result');
+ $xfer += $output->writeStructBegin('Airavata_createNotification_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15836,7 +15941,7 @@ class Airavata_updateNotification_result {
}
-class Airavata_deleteNotification_args {
+class Airavata_updateNotification_args {
static $_TSPEC;
/**
@@ -15844,13 +15949,9 @@ class Airavata_deleteNotification_args {
*/
public $authzToken = null;
/**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
+ * @var \Airavata\Model\Workspace\Notification
*/
- public $notificationId = null;
+ public $notification = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15861,12 +15962,9 @@ class Airavata_deleteNotification_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'notificationId',
- 'type' => TType::STRING,
+ 'var' => 'notification',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Notification',
),
);
}
@@ -15874,17 +15972,14 @@ class Airavata_deleteNotification_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['notificationId'])) {
- $this->notificationId = $vals['notificationId'];
+ if (isset($vals['notification'])) {
+ $this->notification = $vals['notification'];
}
}
}
public function getName() {
- return 'Airavata_deleteNotification_args';
+ return 'Airavata_updateNotification_args';
}
public function read($input)
@@ -15911,15 +16006,9 @@ class Airavata_deleteNotification_args {
}
break;
case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->notificationId);
+ if ($ftype == TType::STRUCT) {
+ $this->notification = new \Airavata\Model\Workspace\Notification();
+ $xfer += $this->notification->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -15936,7 +16025,7 @@ class Airavata_deleteNotification_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteNotification_args');
+ $xfer += $output->writeStructBegin('Airavata_updateNotification_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15945,14 +16034,12 @@ class Airavata_deleteNotification_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->notificationId !== null) {
- $xfer += $output->writeFieldBegin('notificationId', TType::STRING, 3);
- $xfer += $output->writeString($this->notificationId);
+ if ($this->notification !== null) {
+ if (!is_object($this->notification)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('notification', TType::STRUCT, 2);
+ $xfer += $this->notification->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -15962,7 +16049,308 @@ class Airavata_deleteNotification_args {
}
-class Airavata_deleteNotification_result {
+class Airavata_updateNotification_result {
+ static $_TSPEC;
+
+ /**
+ * @var bool
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::BOOL,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_updateNotification_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_updateNotification_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $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;
+ }
+
+}
+
+class Airavata_deleteNotification_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $notificationId = 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,
+ ),
+ 3 => array(
+ 'var' => 'notificationId',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['notificationId'])) {
+ $this->notificationId = $vals['notificationId'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_deleteNotification_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->notificationId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_deleteNotification_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $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, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->notificationId !== null) {
+ $xfer += $output->writeFieldBegin('notificationId', TType::STRING, 3);
+ $xfer += $output->writeString($this->notificationId);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_deleteNotification_result {
static $_TSPEC;
/**
@@ -16645,15 +17033,15 @@ class Airavata_getAllNotifications_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size7 = 0;
- $_etype10 = 0;
- $xfer += $input->readListBegin($_etype10, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ $_size14 = 0;
+ $_etype17 = 0;
+ $xfer += $input->readListBegin($_etype17, $_size14);
+ for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
{
- $elem12 = null;
- $elem12 = new \Airavata\Model\Workspace\Notification();
- $xfer += $elem12->read($input);
- $this->success []= $elem12;
+ $elem19 = null;
+ $elem19 = new \Airavata\Model\Workspace\Notification();
+ $xfer += $elem19->read($input);
+ $this->success []= $elem19;
}
$xfer += $input->readListEnd();
} else {
@@ -16713,9 +17101,9 @@ class Airavata_getAllNotifications_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter13)
+ foreach ($this->success as $iter20)
{
- $xfer += $iter13->write($output);
+ $xfer += $iter20->write($output);
}
}
$output->writeListEnd();
@@ -17839,17 +18227,17 @@ class Airavata_getAllGatewaySSHPubKeys_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size14 = 0;
- $_ktype15 = 0;
- $_vtype16 = 0;
- $xfer += $input->readMapBegin($_ktype15, $_vtype16, $_size14);
- for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
+ $_size21 = 0;
+ $_ktype22 = 0;
+ $_vtype23 = 0;
+ $xfer += $input->readMapBegin($_ktype22, $_vtype23, $_size21);
+ for ($_i25 = 0; $_i25 < $_size21; ++$_i25)
{
- $key19 = '';
- $val20 = '';
- $xfer += $input->readString($key19);
- $xfer += $input->readString($val20);
- $this->success[$key19] = $val20;
+ $key26 = '';
+ $val27 = '';
+ $xfer += $input->readString($key26);
+ $xfer += $input->readString($val27);
+ $this->success[$key26] = $val27;
}
$xfer += $input->readMapEnd();
} else {
@@ -17901,10 +18289,10 @@ class Airavata_getAllGatewaySSHPubKeys_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter21 => $viter22)
+ foreach ($this->success as $kiter28 => $viter29)
{
- $xfer += $output->writeString($kiter21);
- $xfer += $output->writeString($viter22);
+ $xfer += $output->writeString($kiter28);
+ $xfer += $output->writeString($viter29);
}
}
$output->writeMapEnd();
@@ -18126,17 +18514,17 @@ class Airavata_getAllGatewayPWDCredentials_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size23 = 0;
- $_ktype24 = 0;
- $_vtype25 = 0;
- $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ $_size30 = 0;
+ $_ktype31 = 0;
+ $_vtype32 = 0;
+ $xfer += $input->readMapBegin($_ktype31, $_vtype32, $_size30);
+ for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
{
- $key28 = '';
- $val29 = '';
- $xfer += $input->readString($key28);
- $xfer += $input->readString($val29);
- $this->success[$key28] = $val29;
+ $key35 = '';
+ $val36 = '';
+ $xfer += $input->readString($key35);
+ $xfer += $input->readString($val36);
+ $this->success[$key35] = $val36;
}
$xfer += $input->readMapEnd();
} else {
@@ -18188,10 +18576,10 @@ class Airavata_getAllGatewayPWDCredentials_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter30 => $viter31)
+ foreach ($this->success as $kiter37 => $viter38)
{
- $xfer += $output->writeString($kiter30);
- $xfer += $output->writeString($viter31);
+ $xfer += $output->writeString($kiter37);
+ $xfer += $output->writeString($viter38);
}
}
$output->writeMapEnd();
@@ -20268,15 +20656,15 @@ class Airavata_getUserProjects_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size32 = 0;
- $_etype35 = 0;
- $xfer += $input->readListBegin($_etype35, $_size32);
- for ($_i36 = 0; $_i36 < $_size32; ++$_i36)
+ $_size39 = 0;
+ $_etype42 = 0;
+ $xfer += $input->readListBegin($_etype42, $_size39);
+ for ($_i43 = 0; $_i43 < $_size39; ++$_i43)
{
- $elem37 = null;
- $elem37 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem37->read($input);
- $this->success []= $elem37;
+ $elem44 = null;
+ $elem44 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem44->read($input);
+ $this->success []= $elem44;
}
$xfer += $input->readListEnd();
} else {
@@ -20336,9 +20724,9 @@ class Airavata_getUserProjects_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter38)
+ foreach ($this->success as $iter45)
{
- $xfer += $iter38->write($output);
+ $xfer += $iter45->write($output);
}
}
$output->writeListEnd();
@@ -20666,15 +21054,15 @@ class Airavata_searchProjectsByProjectName_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size39 = 0;
- $_etype42 = 0;
- $xfer += $input->readListBegin($_etype42, $_size39);
- for ($_i43 = 0; $_i43 < $_size39; ++$_i43)
+ $_size46 = 0;
+ $_etype49 = 0;
+ $xfer += $input->readListBegin($_etype49, $_size46);
+ for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
{
- $elem44 = null;
- $elem44 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem44->read($input);
- $this->success []= $elem44;
+ $elem51 = null;
+ $elem51 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem51->read($input);
+ $this->success []= $elem51;
}
$xfer += $input->readListEnd();
} else {
@@ -20734,9 +21122,9 @@ class Airavata_searchProjectsByProjectName_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter45)
+ foreach ($this->success as $iter52)
{
- $xfer += $iter45->write($output);
+ $xfer += $iter52->write($output);
}
}
$output->writeListEnd();
@@ -21064,15 +21452,15 @@ class Airavata_searchProjectsByProjectDesc_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
+ $_size53 = 0;
+ $_etype56 = 0;
+ $xfer += $input->readListBegin($_etype56, $_size53);
+ for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
{
- $elem51 = null;
- $elem51 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem51->read($input);
- $this->success []= $elem51;
+ $elem58 = null;
+ $elem58 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem58->read($input);
+ $this->success []= $elem58;
}
$xfer += $input->readListEnd();
} else {
@@ -21132,9 +21520,9 @@ class Airavata_searchProjectsByProjectDesc_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter52)
+ foreach ($this->success as $iter59)
{
- $xfer += $iter52->write($output);
+ $xfer += $iter59->write($output);
}
}
$output->writeListEnd();
@@ -21462,15 +21850,15 @@ class Airavata_searchExperimentsByName_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size53 = 0;
- $_etype56 = 0;
- $xfer += $input->readListBegin($_etype56, $_size53);
- for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
+ $_size60 = 0;
+ $_etype63 = 0;
+ $xfer += $input->readListBegin($_etype63, $_size60);
+ for ($_i64 = 0; $_i64 < $_size60; ++$_i64)
{
- $elem58 = null;
- $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem58->read($input);
- $this->success []= $elem58;
+ $elem65 = null;
+ $elem65 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem65->read($input);
+ $this->success []= $elem65;
}
$xfer += $input->readListEnd();
} else {
@@ -21530,9 +21918,9 @@ class Airavata_searchExperimentsByName_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter59)
+ foreach ($this->success as $iter66)
{
- $xfer += $iter59->write($output);
+ $xfer += $iter66->write($output);
}
}
$output->writeListEnd();
@@ -21860,15 +22248,15 @@ class Airavata_searchExperimentsByDesc_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size60 = 0;
- $_etype63 = 0;
- $xfer += $input->readListBegin($_etype63, $_size60);
- for ($_i64 = 0; $_i64 < $_size60; ++$_i64)
+ $_size67 = 0;
+ $_etype70 = 0;
+ $xfer += $input->readListBegin($_etype70, $_size67);
+ for ($_i71 = 0; $_i71 < $_size67; ++$_i71)
{
- $elem65 = null;
- $elem65 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem65->read($input);
- $this->success []= $elem65;
+ $elem72 = null;
+ $elem72 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem72->read($input);
+ $this->success []= $elem72;
}
$xfer += $input->readListEnd();
} else {
@@ -21928,9 +22316,9 @@ class Airavata_searchExperimentsByDesc_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter66)
+ foreach ($this->success as $iter73)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter73->write($output);
}
}
$output->writeListEnd();
@@ -22258,15 +22646,15 @@ class Airavata_searchExperimentsByApplication_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size67 = 0;
- $_etype70 = 0;
- $xfer += $input->readListBegin($_etype70, $_size67);
- for ($_i71 = 0; $_i71 < $_size67; ++$_i71)
+ $_size74 = 0;
+ $_etype77 = 0;
+ $xfer += $input->readListBegin($_etype77, $_size74);
+ for ($_i78 = 0; $_i78 < $_size74; ++$_i78)
{
- $elem72 = null;
- $elem72 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem72->read($input);
- $this->success []= $elem72;
+ $elem79 = null;
+ $elem79 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem79->read($input);
+ $this->success []= $elem79;
}
$xfer += $input->readListEnd();
} else {
@@ -22326,9 +22714,9 @@ class Airavata_searchExperimentsByApplication_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter73)
+ foreach ($this->success as $iter80)
{
- $xfer += $iter73->write($output);
+ $xfer += $iter80->write($output);
}
}
$output->writeListEnd();
@@ -22656,15 +23044,15 @@ class Airavata_searchExperimentsByStatus_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size74 = 0;
- $_etype77 = 0;
- $xfer += $input->readListBegin($_etype77, $_size74);
- for ($_i78 = 0; $_i78 < $_size74; ++$_i78)
+ $_size81 = 0;
+ $_etype84 = 0;
+ $xfer += $input->readListBegin($_etype84, $_size81);
+ for ($_i85 = 0; $_i85 < $_size81; ++$_i85)
{
- $elem79 = null;
- $elem79 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem79->read($input);
- $this->success []= $elem79;
+ $elem86 = null;
+ $elem86 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem86->read($input);
+ $this->success []= $elem86;
}
$xfer += $input->readListEnd();
} else {
@@ -22724,9 +23112,9 @@ class Airavata_searchExperimentsByStatus_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter80)
+ foreach ($this->success as $iter87)
{
- $xfer += $iter80->write($output);
+ $xfer += $iter87->write($output);
}
}
$output->writeListEnd();
@@ -23077,15 +23465,15 @@ class Airavata_searchExperimentsByCreationTime_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size81 = 0;
- $_etype84 = 0;
- $xfer += $input->readListBegin($_etype84, $_size81);
- for ($_i85 = 0; $_i85 < $_size81; ++$_i85)
+ $_size88 = 0;
+ $_etype91 = 0;
+ $xfer += $input->readListBegin($_etype91, $_size88);
+ for ($_i92 = 0; $_i92 < $_size88; ++$_i92)
{
- $elem86 = null;
- $elem86 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem86->read($input);
- $this->success []= $elem86;
+ $elem93 = null;
+ $elem93 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem93->read($input);
+ $this->success []= $elem93;
}
$xfer += $input->readListEnd();
} else {
@@ -23145,9 +23533,9 @@ class Airavata_searchExperimentsByCreationTime_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter87)
+ foreach ($this->success as $iter94)
{
- $xfer += $iter87->write($output);
+ $xfer += $iter94->write($output);
}
}
$output->writeListEnd();
@@ -23313,17 +23701,17 @@ class Airavata_searchExperiments_args {
case 4:
if ($ftype == TType::MAP) {
$this->filters = array();
- $_size88 = 0;
- $_ktype89 = 0;
- $_vtype90 = 0;
- $xfer += $input->readMapBegin($_ktype89, $_vtype90, $_size88);
- for ($_i92 = 0; $_i92 < $_size88; ++$_i92)
+ $_size95 = 0;
+ $_ktype96 = 0;
+ $_vtype97 = 0;
+ $xfer += $input->readMapBegin($_ktype96, $_vtype97, $_size95);
+ for ($_i99 = 0; $_i99 < $_size95; ++$_i99)
{
- $key93 = 0;
- $val94 = '';
- $xfer += $input->readI32($key93);
- $xfer += $input->readString($val94);
- $this->filters[$key93] = $val94;
+ $key100 = 0;
+ $val101 = '';
+ $xfer += $input->readI32($key100);
+ $xfer += $input->readString($val101);
+ $this->filters[$key100] = $val101;
}
$xfer += $input->readMapEnd();
} else {
@@ -23383,10 +23771,10 @@ class Airavata_searchExperiments_args {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
{
- foreach ($this->filters as $kiter95 => $viter96)
+ foreach ($this->filters as $kiter102 => $viter103)
{
- $xfer += $output->writeI32($kiter95);
- $xfer += $output->writeString($viter96);
+ $xfer += $output->writeI32($kiter102);
+ $xfer += $output->writeString($viter103);
}
}
$output->writeMapEnd();
@@ -23509,15 +23897,15 @@ class Airavata_searchExperiments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size97 = 0;
- $_etype100 = 0;
- $xfer += $input->readListBegin($_etype100, $_size97);
- for ($_i101 = 0; $_i101 < $_size97; ++$_i101)
+ $_size104 = 0;
+ $_etype107 = 0;
+ $xfer += $input->readListBegin($_etype107, $_size104);
+ for ($_i108 = 0; $_i108 < $_size104; ++$_i108)
{
- $elem102 = null;
- $elem102 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem102->read($input);
- $this->success []= $elem102;
+ $elem109 = null;
+ $elem109 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem109->read($input);
+ $this->success []= $elem109;
}
$xfer += $input->readListEnd();
} else {
@@ -23577,9 +23965,9 @@ class Airavata_searchExperiments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter103)
+ foreach ($this->success as $iter110)
{
- $xfer += $iter103->write($output);
+ $xfer += $iter110->write($output);
}
}
$output->writeListEnd();
@@ -24202,15 +24590,15 @@ class Airavata_getExperimentsInProject_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size104 = 0;
- $_etype107 = 0;
- $xfer += $input->readListBegin($_etype107, $_size104);
- for ($_i108 = 0; $_i108 < $_size104; ++$_i108)
+ $_size111 = 0;
+ $_etype114 = 0;
+ $xfer += $input->readListBegin($_etype114, $_size111);
+ for ($_i115 = 0; $_i115 < $_size111; ++$_i115)
{
- $elem109 = null;
- $elem109 = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $elem109->read($input);
- $this->success []= $elem109;
+ $elem116 = null;
+ $elem116 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem116->read($input);
+ $this->success []= $elem116;
}
$xfer += $input->readListEnd();
} else {
@@ -24278,9 +24666,9 @@ class Airavata_getExperimentsInProject_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter110)
+ foreach ($this->success as $iter117)
{
- $xfer += $iter110->write($output);
+ $xfer += $iter117->write($output);
}
}
$output->writeListEnd();
@@ -24590,15 +24978,15 @@ class Airavata_getUserExperiments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size111 = 0;
- $_etype114 = 0;
- $xfer += $input->readListBegin($_etype114, $_size111);
- for ($_i115 = 0; $_i115 < $_size111; ++$_i115)
+ $_size118 = 0;
+ $_etype121 = 0;
+ $xfer += $input->readListBegin($_etype121, $_size118);
+ for ($_i122 = 0; $_i122 < $_size118; ++$_i122)
{
- $elem116 = null;
- $elem116 = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $elem116->read($input);
- $this->success []= $elem116;
+ $elem123 = null;
+ $elem123 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem123->read($input);
+ $this->success []= $elem123;
}
$xfer += $input->readListEnd();
} else {
@@ -24658,9 +25046,9 @@ class Airavata_getUserExperiments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter117)
+ foreach ($this->success as $iter124)
{
- $xfer += $iter117->write($output);
+ $xfer += $iter124->write($output);
}
}
$output->writeListEnd();
@@ -27746,15 +28134,15 @@ class Airavata_getExperimentOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size118 = 0;
- $_etype121 = 0;
- $xfer += $input->readListBegin($_etype121, $_size118);
- for ($_i122 = 0; $_i122 < $_size118; ++$_i122)
+ $_size125 = 0;
+ $_etype128 = 0;
+ $xfer += $input->readListBegin($_etype128, $_size125);
+ for ($_i129 = 0; $_i129 < $_size125; ++$_i129)
{
- $elem123 = null;
- $elem123 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem123->read($input);
- $this->success []= $elem123;
+ $elem130 = null;
+ $elem130 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem130->read($input);
+ $this->success []= $elem130;
}
$xfer += $input->readListEnd();
} else {
@@ -27822,9 +28210,9 @@ class Airavata_getExperimentOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter124)
+ foreach ($this->success as $iter131)
{
- $xfer += $iter124->write($output);
+ $xfer += $iter131->write($output);
}
}
$output->writeListEnd();
@@ -28077,15 +28465,15 @@ class Airavata_getIntermediateOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size125 = 0;
- $_etype128 = 0;
- $xfer += $input->readListBegin($_etype128, $_size125);
- for ($_i129 = 0; $_i129 < $_size125; ++$_i129)
+ $_size132 = 0;
+ $_etype135 = 0;
+ $xfer += $input->readListBegin($_etype135, $_size132);
+ for ($_i136 = 0; $_i136 < $_size132; ++$_i136)
{
- $elem130 = null;
- $elem130 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem130->read($input);
- $this->success []= $elem130;
+ $elem137 = null;
+ $elem137 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem137->read($input);
+ $this->success []= $elem137;
}
$xfer += $input->readListEnd();
} else {
@@ -28153,9 +28541,9 @@ class Airavata_getIntermediateOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter131)
+ foreach ($this->success as $iter138)
{
- $xfer += $iter131->write($output);
+ $xfer += $iter138->write($output);
}
}
$output->writeListEnd();
@@ -28412,18 +28800,18 @@ class Airavata_getJobStatuses_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size132 = 0;
- $_ktype133 = 0;
- $_vtype134 = 0;
- $xfer += $input->readMapBegin($_ktype133, $_vtype134, $_size132);
- for ($_i136 = 0; $_i136 < $_size132; ++$_i136)
+ $_size139 = 0;
+ $_ktype140 = 0;
+ $_vtype141 = 0;
+ $xfer += $input->readMapBegin($_ktype140, $_vtype141, $_size139);
+ for ($_i143 = 0; $_i143 < $_size139; ++$_i143)
{
- $key137 = '';
- $val138 = new \Airavata\Model\Status\JobStatus();
- $xfer += $input->readString($key137);
- $val138 = new \Airavata\Model\Status\JobStatus();
- $xfer += $val138->read($input);
- $this->success[$key137] = $val138;
+ $key144 = '';
+ $val145 = new \Airavata\Model\Status\JobStatus();
+ $xfer += $input->readString($key144);
+ $val145 = new \Airavata\Model\Status\JobStatus();
+ $xfer += $val145->read($input);
+ $this->success[$key144] = $val145;
}
$xfer += $input->readMapEnd();
} else {
@@ -28491,10 +28879,10 @@ class Airavata_getJobStatuses_result {
{
$output->writeMapBegin(TType::STRING, TType::STRUCT, count($this->success));
{
- foreach ($this->success as $kiter139 => $viter140)
+ foreach ($this->success as $kiter146 => $viter147)
{
- $xfer += $output->writeString($kiter139);
- $xfer += $viter140->write($output);
+ $xfer += $output->writeString($kiter146);
+ $xfer += $viter147->write($output);
}
}
$output->writeMapEnd();
@@ -28747,15 +29135,15 @@ class Airavata_getJobDetails_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size141 = 0;
- $_etype144 = 0;
- $xfer += $input->readListBegin($_etype144, $_size141);
- for ($_i145 = 0; $_i145 < $_size141; ++$_i145)
+ $_size148 = 0;
+ $_etype151 = 0;
+ $xfer += $input->readListBegin($_etype151, $_size148);
+ for ($_i152 = 0; $_i152 < $_size148; ++$_i152)
{
- $elem146 = null;
- $elem146 = new \Airavata\Model\Job\JobModel();
- $xfer += $elem146->read($input);
- $this->success []= $elem146;
+ $elem153 = null;
+ $elem153 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem153->read($input);
+ $this->success []= $elem153;
}
$xfer += $input->readListEnd();
} else {
@@ -28823,9 +29211,9 @@ class Airavata_getJobDetails_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter147)
+ foreach ($this->success as $iter154)
{
- $xfer += $iter147->write($output);
+ $xfer += $iter154->write($output);
}
}
$output->writeListEnd();
@@ -30590,15 +30978,15 @@ class Airavata_getAllAppModules_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size148 = 0;
- $_etype151 = 0;
- $xfer += $input->readListBegin($_etype151, $_size148);
- for ($_i152 = 0; $_i152 < $_size148; ++$_i152)
+ $_size155 = 0;
+ $_etype158 = 0;
+ $xfer += $input->readListBegin($_etype158, $_size155);
+ for ($_i159 = 0; $_i159 < $_size155; ++$_i159)
{
- $elem153 = null;
- $elem153 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
- $xfer += $elem153->read($input);
- $this->success []= $elem153;
+ $elem160 = null;
+ $elem160 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
+ $xfer += $elem160->read($input);
+ $this->success []= $elem160;
}
$xfer += $input->readListEnd();
} else {
@@ -30658,9 +31046,9 @@ class Airavata_getAllAppModules_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter154)
+ foreach ($this->success as $iter161)
{
- $xfer += $iter154->write($output);
+ $xfer += $iter161->write($output);
}
}
$output->writeListEnd();
@@ -32347,15 +32735,15 @@ class Airavata_getAllApplicationDeployments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size155 = 0;
- $_etype158 = 0;
- $xfer += $input->readListBegin($_etype158, $_size155);
- for ($_i159 = 0; $_i159 < $_size155; ++$_i159)
+ $_size162 = 0;
+ $_etype165 = 0;
+ $xfer += $input->readListBegin($_etype165, $_size162);
+ for ($_i166 = 0; $_i166 < $_size162; ++$_i166)
{
- $elem160 = null;
- $elem160 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
- $xfer += $elem160->read($input);
- $this->success []= $elem160;
+ $elem167 = null;
+ $elem167 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
+ $xfer += $elem167->read($input);
+ $this->success []= $elem167;
}
$xfer += $input->readListEnd();
} else {
@@ -32415,9 +32803,9 @@ class Airavata_getAllApplicationDeployments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter161)
+ foreach ($this->success as $iter168)
{
- $xfer += $iter161->write($output);
+ $xfer += $iter168->write($output);
}
}
$output->writeListEnd();
@@ -32652,14 +33040,14 @@ class Airavata_getAppModuleDeployedResources_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size162 = 0;
- $_etype165 = 0;
- $xfer += $input->readListBegin($_etype165, $_size162);
- for ($_i166 = 0; $_i166 < $_size162; ++$_i166)
+ $_size169 = 0;
+ $_etype172 = 0;
+ $xfer += $input->readListBegin($_etype172, $_size169);
+ for ($_i173 = 0; $_i173 < $_size169; ++$_i173)
{
- $elem167 = null;
- $xfer += $input->readString($elem167);
- $this->success []= $elem167;
+ $elem174 = null;
+ $xfer += $input->readString($elem174);
+ $this->success []= $elem174;
}
$xfer += $input->readListEnd();
} else {
@@ -32719,9 +33107,9 @@ class Airavata_getAppModuleDeployedResources_result {
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter168)
+ foreach ($this->success as $iter175)
{
- $xfer += $output->writeString($iter168);
+ $xfer += $output->writeString($iter175);
}
}
$output->writeListEnd();
@@ -34457,17 +34845,17 @@ class Airavata_getAllApplicationInterfaceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size169 = 0;
- $_ktype170 = 0;
- $_vtype171 = 0;
- $xfer += $input->readMapBegin($_ktype170, $_vtype171, $_size169);
- for ($_i173 = 0; $_i173 < $_size169; ++$_i173)
+ $_size176 = 0;
+ $_ktype177 = 0;
+ $_vtype178 = 0;
+ $xfer += $input->readMapBegin($_ktype177, $_vtype178, $_size176);
+ for ($_i180 = 0; $_i180 < $_size176; ++$_i180)
{
- $key174 = '';
- $val175 = '';
- $xfer += $input->readString($key174);
- $xfer += $input->readString($val175);
- $this->success[$key174] = $val175;
+ $key181 = '';
+ $val182 = '';
+ $xfer += $input->readString($key181);
+ $xfer += $input->readString($val182);
+ $this->success[$key181] = $val182;
}
$xfer += $input->readMapEnd();
} else {
@@ -34527,10 +34915,10 @@ class Airavata_getAllApplicationInterfaceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter176 => $viter177)
+ foreach ($this->success as $kiter183 => $viter184)
{
- $xfer += $output->writeString($kiter176);
- $xfer += $output->writeString($viter177);
+ $xfer += $output->writeString($kiter183);
+ $xfer += $output->writeString($viter184);
}
}
$output->writeMapEnd();
@@ -34766,15 +35154,15 @@ class Airavata_getAllApplicationInterfaces_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size178 = 0;
- $_etype181 = 0;
- $xfer += $input->readListBegin($_etype181, $_size178);
- for ($_i182 = 0; $_i182 < $_size178; ++$_i182)
+ $_size185 = 0;
+ $_etype188 = 0;
+ $xfer += $input->readListBegin($_etype188, $_size185);
+ for ($_i189 = 0; $_i189 < $_size185; ++$_i189)
{
- $elem183 = null;
- $elem183 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
- $xfer += $elem183->read($input);
- $this->success []= $elem183;
+ $elem190 = null;
+ $elem190 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
+ $xfer += $elem190->read($input);
+ $this->success []= $elem190;
}
$xfer += $input->readListEnd();
} else {
@@ -34834,9 +35222,9 @@ class Airavata_getAllApplicationInterfaces_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter184)
+ foreach ($this->success as $iter191)
{
- $xfer += $iter184->write($output);
+ $xfer += $iter191->write($output);
}
}
$output->writeListEnd();
@@ -35072,15 +35460,15 @@ class Airavata_getApplicationInputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size185 = 0;
- $_etype188 = 0;
- $xfer += $input->readListBegin($_etype188, $_size185);
- for ($_i189 = 0; $_i189 < $_size185; ++$_i189)
+ $_size192 = 0;
+ $_etype195 = 0;
+ $xfer += $input->readListBegin($_etype195, $_size192);
+ for ($_i196 = 0; $_i196 < $_size192; ++$_i196)
{
- $elem190 = null;
- $elem190 = new \Airavata\Model\Application\Io\InputDataObjectType();
- $xfer += $elem190->read($input);
- $this->success []= $elem190;
+ $elem197 = null;
+ $elem197 = new \Airavata\Model\Application\Io\InputDataObjectType();
+ $xfer += $elem197->read($input);
+ $this->success []= $elem197;
}
$xfer += $input->readListEnd();
} else {
@@ -35140,9 +35528,9 @@ class Airavata_getApplicationInputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter191)
+ foreach ($this->success as $iter198)
{
- $xfer += $iter191->write($output);
+ $xfer += $iter198->write($output);
}
}
$output->writeListEnd();
@@ -35378,15 +35766,15 @@ class Airavata_getApplicationOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size192 = 0;
- $_etype195 = 0;
- $xfer += $input->readListBegin($_etype195, $_size192);
- for ($_i196 = 0; $_i196 < $_size192; ++$_i196)
+ $_size199 = 0;
+ $_etype202 = 0;
+ $xfer += $input->readListBegin($_etype202, $_size199);
+ for ($_i203 = 0; $_i203 < $_size199; ++$_i203)
{
- $elem197 = null;
- $elem197 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem197->read($input);
- $this->success []= $elem197;
+ $elem204 = null;
+ $elem204 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem204->read($input);
+ $this->success []= $elem204;
}
$xfer += $input->readListEnd();
} else {
@@ -35446,9 +35834,9 @@ class Airavata_getApplicationOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter198)
+ foreach ($this->success as $iter205)
{
- $xfer += $iter198->write($output);
+ $xfer += $iter205->write($output);
}
}
$output->writeListEnd();
@@ -35687,17 +36075,17 @@ class Airavata_getAvailableAppInterfaceComputeResources_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size199 = 0;
- $_ktype200 = 0;
- $_vtype201 = 0;
- $xfer += $input->readMapBegin($_ktype200, $_vtype201, $_size199);
- for ($_i203 = 0; $_i203 < $_size199; ++$_i203)
+ $_size206 = 0;
+ $_ktype207 = 0;
+ $_vtype208 = 0;
+ $xfer += $input->readMapBegin($_ktype207, $_vtype208, $_size206);
+ for ($_i210 = 0; $_i210 < $_size206; ++$_i210)
{
- $key204 = '';
- $val205 = '';
- $xfer += $input->readString($key204);
- $xfer += $input->readString($val205);
- $this->success[$key204] = $val205;
+ $key211 = '';
+ $val212 = '';
+ $xfer += $input->readString($key211);
+ $xfer += $input->readString($val212);
+ $this->success[$key211] = $val212;
}
$xfer += $input->readMapEnd();
} else {
@@ -35757,10 +36145,10 @@ class Airavata_getAvailable
<TRUNCATED>
[48/53] [abbrv] airavata git commit: Changed data staging task to
work with multiple inputs
Posted by sh...@apache.org.
Changed data staging task to work with multiple inputs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/73fee6be
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/73fee6be
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/73fee6be
Branch: refs/heads/master
Commit: 73fee6be73c9265e637475e6c4443b895fe9556c
Parents: d20f77e
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Jul 6 14:31:14 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Jul 6 14:32:05 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 4 +++-
.../java/org/apache/airavata/gfac/impl/task/DataStageTask.java | 3 +--
.../org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
index 3fb95e0..f64e521 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
@@ -529,7 +529,7 @@ public class GFacEngineImpl implements GFacEngine {
return false;
}
- private boolean inputDataStaging(TaskContext taskContext, boolean recover) throws GFacException {
+ private boolean inputDataStaging(TaskContext taskContext, boolean recover) throws GFacException, TException {
TaskStatus taskStatus = new TaskStatus(TaskState.EXECUTING);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
taskContext.setTaskStatus(taskStatus);
@@ -541,8 +541,10 @@ public class GFacEngineImpl implements GFacEngine {
if (taskContext.getProcessInput().getType() == DataType.URI_COLLECTION) {
String values = taskContext.getProcessInput().getValue();
String[] multiple_inputs = values.split(GFacConstants.MULTIPLE_INPUTS_SPLITTER);
+ DataStagingTaskModel subTaskModel = (DataStagingTaskModel) taskContext.getSubTaskModel();
for (String input : multiple_inputs) {
taskContext.getProcessInput().setValue(input);
+ subTaskModel.setSource(input);
taskStatus = executeTask(taskContext, dMoveTask, false);
}
taskContext.getProcessInput().setValue(values);
http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
index ec3ffd7..69e8d77 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
@@ -56,8 +56,7 @@ public class DataStageTask implements Task {
+ taskContext.getTaskModel().getTaskType().toString());
} else {
try {
- DataStagingTaskModel subTaskModel = (DataStagingTaskModel) ThriftUtils.getSubTaskModel(taskContext
- .getTaskModel());
+ DataStagingTaskModel subTaskModel = ((DataStagingTaskModel) taskContext.getSubTaskModel());
URI sourceURI = new URI(subTaskModel.getSource());
URI destinationURI = new URI(subTaskModel.getDestination());
http://git-wip-us.apache.org/repos/asf/airavata/blob/73fee6be/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index 17522e9..904d486 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -83,8 +83,7 @@ public class SCPDataStageTask implements Task {
String localDataDir = null;
ProcessState processState = taskContext.getParentProcessContext().getProcessState();
try {
- subTaskModel = (DataStagingTaskModel) ThriftUtils.getSubTaskModel
- (taskContext.getTaskModel());
+ subTaskModel = ((DataStagingTaskModel) taskContext.getSubTaskModel());
if (processState == ProcessState.OUTPUT_DATA_STAGING) {
OutputDataObjectType processOutput = taskContext.getProcessOutput();
if (processOutput != null && processOutput.getValue() == null) {
[12/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 8794b23..634301f 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
@@ -529,178 +529,6 @@ class Iface:
"""
pass
- def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
- """
-
- Search User Experiments by Name
- Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the user who created the experiments.
-
- @param expName
- Experiment name 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
- - expName
- - limit
- - offset
- """
- pass
-
- def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
- """
-
- Search By Experiment Description
- Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the requested user.
-
- @param description
- Experiment description 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
- - limit
- - offset
- """
- pass
-
- def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
- """
-
- Search Experiment By the Application
- Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the requested user.
-
- @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
- - applicationId
- - limit
- - offset
- """
- pass
-
- def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
- """
-
- Search User Experiments by Status
- Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the user making the request.
-
- @param experimentState
- Experiement state 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
- - experimentState
- - limit
- - offset
- """
- pass
-
- def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
- """
-
- Search User Experiments by the Creation Time
- This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique 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.
-
- @param limit
- Amount of results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
- @return ExperimentSummaryModel
- List of experiments for the given search filter. Here only the Experiment summary will be returned.
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - fromTime
- - toTime
- - limit
- - offset
- """
- pass
-
def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
Search Experiments.
@@ -4503,364 +4331,6 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result")
- def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
- """
-
- Search User Experiments by Name
- Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the user who created the experiments.
-
- @param expName
- Experiment name 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
- - expName
- - limit
- - offset
- """
- self.send_searchExperimentsByName(authzToken, gatewayId, userName, expName, limit, offset)
- return self.recv_searchExperimentsByName()
-
- 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()
-
- def recv_searchExperimentsByName(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperimentsByName_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, "searchExperimentsByName failed: unknown result")
-
- def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
- """
-
- Search By Experiment Description
- Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the requested user.
-
- @param description
- Experiment description 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
- - limit
- - offset
- """
- self.send_searchExperimentsByDesc(authzToken, gatewayId, userName, description, limit, offset)
- return self.recv_searchExperimentsByDesc()
-
- 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.description = description
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchExperimentsByDesc(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperimentsByDesc_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, "searchExperimentsByDesc failed: unknown result")
-
- def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
- """
-
- Search Experiment By the Application
- Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the requested user.
-
- @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
- - applicationId
- - limit
- - offset
- """
- self.send_searchExperimentsByApplication(authzToken, gatewayId, userName, applicationId, limit, offset)
- return self.recv_searchExperimentsByApplication()
-
- 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.applicationId = applicationId
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchExperimentsByApplication(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperimentsByApplication_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, "searchExperimentsByApplication failed: unknown result")
-
- def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
- """
-
- Search User Experiments by Status
- Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
-
- @param gatewayId
- Unique identifier of the requested gateway.
-
- @param userName
- Username of the user making the request.
-
- @param experimentState
- Experiement state 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
- - experimentState
- - limit
- - offset
- """
- self.send_searchExperimentsByStatus(authzToken, gatewayId, userName, experimentState, limit, offset)
- return self.recv_searchExperimentsByStatus()
-
- 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.experimentState = experimentState
- args.limit = limit
- args.offset = offset
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_searchExperimentsByStatus(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = searchExperimentsByStatus_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, "searchExperimentsByStatus failed: unknown result")
-
- def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
- """
-
- Search User Experiments by the Creation Time
- This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
-
- @param gatewayId
- Unique 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.
-
- @param limit
- Amount of results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
- @return ExperimentSummaryModel
- List of experiments for the given search filter. Here only the Experiment summary will be returned.
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - fromTime
- - toTime
- - limit
- - offset
- """
- self.send_searchExperimentsByCreationTime(authzToken, gatewayId, userName, fromTime, toTime, limit, offset)
- return self.recv_searchExperimentsByCreationTime()
-
- 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.fromTime = fromTime
- args.toTime = toTime
- args.limit = limit
- args.offset = offset
- 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
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result")
-
def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
Search Experiments.
@@ -11082,11 +10552,6 @@ class Processor(Iface, TProcessor):
self._processMap["getUserProjects"] = Processor.process_getUserProjects
self._processMap["searchProjectsByProjectName"] = Processor.process_searchProjectsByProjectName
self._processMap["searchProjectsByProjectDesc"] = Processor.process_searchProjectsByProjectDesc
- self._processMap["searchExperimentsByName"] = Processor.process_searchExperimentsByName
- self._processMap["searchExperimentsByDesc"] = Processor.process_searchExperimentsByDesc
- self._processMap["searchExperimentsByApplication"] = Processor.process_searchExperimentsByApplication
- self._processMap["searchExperimentsByStatus"] = Processor.process_searchExperimentsByStatus
- self._processMap["searchExperimentsByCreationTime"] = Processor.process_searchExperimentsByCreationTime
self._processMap["searchExperiments"] = Processor.process_searchExperiments
self._processMap["getExperimentStatistics"] = Processor.process_getExperimentStatistics
self._processMap["getExperimentsInProject"] = Processor.process_getExperimentsInProject
@@ -12073,161 +11538,6 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_searchExperimentsByName(self, seqid, iprot, oprot):
- args = searchExperimentsByName_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByName_result()
- try:
- result.success = self._handler.searchExperimentsByName(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchExperimentsByName", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByDesc(self, seqid, iprot, oprot):
- args = searchExperimentsByDesc_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByDesc_result()
- try:
- result.success = self._handler.searchExperimentsByDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchExperimentsByDesc", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByApplication(self, seqid, iprot, oprot):
- args = searchExperimentsByApplication_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByApplication_result()
- try:
- result.success = self._handler.searchExperimentsByApplication(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchExperimentsByApplication", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByStatus(self, seqid, iprot, oprot):
- args = searchExperimentsByStatus_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByStatus_result()
- try:
- result.success = self._handler.searchExperimentsByStatus(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchExperimentsByStatus", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchExperimentsByCreationTime(self, seqid, iprot, oprot):
- args = searchExperimentsByCreationTime_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchExperimentsByCreationTime_result()
- try:
- result.success = self._handler.searchExperimentsByCreationTime(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchExperimentsByCreationTime", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
def process_searchExperiments(self, seqid, iprot, oprot):
args = searchExperiments_args()
args.read(iprot)
@@ -20944,1086 +20254,11 @@ 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 getUserProjects_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - userName
- - limit
- - offset
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRING, 'userName', None, None, ), # 3
- (4, TType.I32, 'limit', None, None, ), # 4
- (5, TType.I32, 'offset', None, None, ), # 5
- )
-
- def __init__(self, authzToken=None, gatewayId=None, userName=None, limit=None, offset=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.limit = limit
- self.offset = offset
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.I32:
- self.limit = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.I32:
- self.offset = iprot.readI32()
- 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('getUserProjects_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, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 4)
- oprot.writeI32(self.limit)
- oprot.writeFieldEnd()
- if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 5)
- oprot.writeI32(self.offset)
- 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:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 getUserProjects_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype42, _size39) = iprot.readListBegin()
- for _i43 in xrange(_size39):
- _elem44 = apache.airavata.model.workspace.ttypes.Project()
- _elem44.read(iprot)
- self.success.append(_elem44)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('getUserProjects_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter45 in self.success:
- iter45.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- 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.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 searchProjectsByProjectName_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - userName
- - projectName
- - limit
- - offset
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRING, 'userName', None, None, ), # 3
- (4, TType.STRING, 'projectName', None, None, ), # 4
- (5, TType.I32, 'limit', None, None, ), # 5
- (6, TType.I32, 'offset', None, None, ), # 6
- )
-
- def __init__(self, authzToken=None, gatewayId=None, userName=None, projectName=None, limit=None, offset=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.projectName = projectName
- self.limit = limit
- self.offset = offset
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.projectName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.I32:
- self.limit = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.I32:
- self.offset = iprot.readI32()
- 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('searchProjectsByProjectName_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, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.projectName is not None:
- oprot.writeFieldBegin('projectName', TType.STRING, 4)
- oprot.writeString(self.projectName)
- oprot.writeFieldEnd()
- if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 5)
- oprot.writeI32(self.limit)
- oprot.writeFieldEnd()
- if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 6)
- oprot.writeI32(self.offset)
- 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:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.projectName is None:
- raise TProtocol.TProtocolException(message='Required field projectName is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.projectName)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 searchProjectsByProjectName_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype49, _size46) = iprot.readListBegin()
- for _i50 in xrange(_size46):
- _elem51 = apache.airavata.model.workspace.ttypes.Project()
- _elem51.read(iprot)
- self.success.append(_elem51)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('searchProjectsByProjectName_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter52 in self.success:
- iter52.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- 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.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 searchProjectsByProjectDesc_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - userName
- - description
- - limit
- - offset
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRING, 'userName', None, None, ), # 3
- (4, TType.STRING, 'description', None, None, ), # 4
- (5, TType.I32, 'limit', None, None, ), # 5
- (6, TType.I32, 'offset', None, None, ), # 6
- )
-
- def __init__(self, authzToken=None, gatewayId=None, userName=None, description=None, limit=None, offset=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.description = description
- self.limit = limit
- self.offset = offset
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.description = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.I32:
- self.limit = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.I32:
- self.offset = iprot.readI32()
- 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('searchProjectsByProjectDesc_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, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
- oprot.writeString(self.description)
- oprot.writeFieldEnd()
- if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 5)
- oprot.writeI32(self.limit)
- oprot.writeFieldEnd()
- if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 6)
- oprot.writeI32(self.offset)
- 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:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.description is None:
- raise TProtocol.TProtocolException(message='Required field description is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.description)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 searchProjectsByProjectDesc_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype56, _size53) = iprot.readListBegin()
- for _i57 in xrange(_size53):
- _elem58 = apache.airavata.model.workspace.ttypes.Project()
- _elem58.read(iprot)
- self.success.append(_elem58)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('searchProjectsByProjectDesc_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter59 in self.success:
- iter59.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- 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.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 searchExperimentsByName_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - userName
- - expName
- - limit
- - offset
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRING, 'userName', None, None, ), # 3
- (4, TType.STRING, 'expName', None, None, ), # 4
- (5, TType.I32, 'limit', None, None, ), # 5
- (6, TType.I32, 'offset', None, None, ), # 6
- )
-
- def __init__(self, authzToken=None, gatewayId=None, userName=None, expName=None, limit=None, offset=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.expName = expName
- self.limit = limit
- self.offset = offset
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.expName = iprot.readString()
+ self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+ self.pnfe.read(iprot)
else:
iprot.skip(ftype)
elif fid == 5:
- if ftype == TType.I32:
- self.limit = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.I32:
- self.offset = iprot.readI32()
- 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('searchExperimentsByName_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, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.expName is not None:
- oprot.writeFieldBegin('expName', TType.STRING, 4)
- oprot.writeString(self.expName)
- oprot.writeFieldEnd()
- if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 5)
- oprot.writeI32(self.limit)
- oprot.writeFieldEnd()
- if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 6)
- oprot.writeI32(self.offset)
- 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:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.expName is None:
- raise TProtocol.TProtocolException(message='Required field expName is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.expName)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 searchExperimentsByName_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype63, _size60) = iprot.readListBegin()
- for _i64 in xrange(_size60):
- _elem65 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem65.read(iprot)
- self.success.append(_elem65)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
if ftype == TType.STRUCT:
self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
self.ae.read(iprot)
@@ -22038,13 +20273,10 @@ class searchExperimentsByName_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByName_result')
+ oprot.writeStructBegin('deleteProject_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter66 in self.success:
- iter66.write(oprot)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22058,8 +20290,12 @@ class searchExperimentsByName_result:
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, 4)
+ oprot.writeFieldBegin('ae', TType.STRUCT, 5)
self.ae.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -22075,6 +20311,7 @@ class searchExperimentsByName_result:
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
@@ -22089,13 +20326,12 @@ class searchExperimentsByName_result:
def __ne__(self, other):
return not (self == other)
-class searchExperimentsByDesc_args:
+class getUserProjects_args:
"""
Attributes:
- authzToken
- gatewayId
- userName
- - description
- limit
- offset
"""
@@ -22105,16 +20341,14 @@ class searchExperimentsByDesc_args:
(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
- (4, TType.STRING, 'description', None, None, ), # 4
- (5, TType.I32, 'limit', None, None, ), # 5
- (6, TType.I32, 'offset', None, None, ), # 6
+ (4, TType.I32, 'limit', None, None, ), # 4
+ (5, TType.I32, 'offset', None, None, ), # 5
)
- def __init__(self, authzToken=None, gatewayId=None, userName=None, description=None, limit=None, offset=None,):
+ def __init__(self, authzToken=None, gatewayId=None, userName=None, limit=None, offset=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
self.userName = userName
- self.description = description
self.limit = limit
self.offset = offset
@@ -22144,16 +20378,11 @@ class searchExperimentsByDesc_args:
else:
iprot.skip(ftype)
elif fid == 4:
- if ftype == TType.STRING:
- self.description = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
if ftype == TType.I32:
self.limit = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 6:
+ elif fid == 5:
if ftype == TType.I32:
self.offset = iprot.readI32()
else:
@@ -22167,7 +20396,7 @@ class searchExperimentsByDesc_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByDesc_args')
+ oprot.writeStructBegin('getUserProjects_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22180,16 +20409,12 @@ class searchExperimentsByDesc_args:
oprot.writeFieldBegin('userName', TType.STRING, 3)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
- oprot.writeString(self.description)
- oprot.writeFieldEnd()
if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 5)
+ oprot.writeFieldBegin('limit', TType.I32, 4)
oprot.writeI32(self.limit)
oprot.writeFieldEnd()
if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 6)
+ oprot.writeFieldBegin('offset', TType.I32, 5)
oprot.writeI32(self.offset)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -22202,8 +20427,6 @@ class searchExperimentsByDesc_args:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.userName is None:
raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.description is None:
- raise TProtocol.TProtocolException(message='Required field description is unset!')
if self.limit is None:
raise TProtocol.TProtocolException(message='Required field limit is unset!')
if self.offset is None:
@@ -22216,7 +20439,6 @@ class searchExperimentsByDesc_args:
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.description)
value = (value * 31) ^ hash(self.limit)
value = (value * 31) ^ hash(self.offset)
return value
@@ -22232,7 +20454,7 @@ class searchExperimentsByDesc_args:
def __ne__(self, other):
return not (self == other)
-class searchExperimentsByDesc_result:
+class getUserProjects_result:
"""
Attributes:
- success
@@ -22243,7 +20465,7 @@ class searchExperimentsByDesc_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -22269,11 +20491,11 @@ class searchExperimentsByDesc_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype70, _size67) = iprot.readListBegin()
- for _i71 in xrange(_size67):
- _elem72 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem72.read(iprot)
- self.success.append(_elem72)
+ (_etype42, _size39) = iprot.readListBegin()
+ for _i43 in xrange(_size39):
+ _elem44 = apache.airavata.model.workspace.ttypes.Project()
+ _elem44.read(iprot)
+ self.success.append(_elem44)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22310,12 +20532,12 @@ class searchExperimentsByDesc_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByDesc_result')
+ oprot.writeStructBegin('getUserProjects_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter73 in self.success:
- iter73.write(oprot)
+ for iter45 in self.success:
+ iter45.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22361,13 +20583,13 @@ class searchExperimentsByDesc_result:
def __ne__(self, other):
return not (self == other)
-class searchExperimentsByApplication_args:
+class searchProjectsByProjectName_args:
"""
Attributes:
- authzToken
- gatewayId
- userName
- - applicationId
+ - projectName
- limit
- offset
"""
@@ -22377,16 +20599,16 @@ class searchExperimentsByApplication_args:
(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
- (4, TType.STRING, 'applicationId', None, None, ), # 4
+ (4, TType.STRING, 'projectName', None, None, ), # 4
(5, TType.I32, 'limit', None, None, ), # 5
(6, TType.I32, 'offset', None, None, ), # 6
)
- def __init__(self, authzToken=None, gatewayId=None, userName=None, applicationId=None, limit=None, offset=None,):
+ def __init__(self, authzToken=None, gatewayId=None, userName=None, projectName=None, limit=None, offset=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
self.userName = userName
- self.applicationId = applicationId
+ self.projectName = projectName
self.limit = limit
self.offset = offset
@@ -22417,7 +20639,7 @@ class searchExperimentsByApplication_args:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRING:
- self.applicationId = iprot.readString()
+ self.projectName = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 5:
@@ -22439,7 +20661,7 @@ class searchExperimentsByApplication_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByApplication_args')
+ oprot.writeStructBegin('searchProjectsByProjectName_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22452,9 +20674,9 @@ class searchExperimentsByApplication_args:
oprot.writeFieldBegin('userName', TType.STRING, 3)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.applicationId is not None:
- oprot.writeFieldBegin('applicationId', TType.STRING, 4)
- oprot.writeString(self.applicationId)
+ if self.projectName is not None:
+ oprot.writeFieldBegin('projectName', TType.STRING, 4)
+ oprot.writeString(self.projectName)
oprot.writeFieldEnd()
if self.limit is not None:
oprot.writeFieldBegin('limit', TType.I32, 5)
@@ -22474,8 +20696,8 @@ class searchExperimentsByApplication_args:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.userName is None:
raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.applicationId is None:
- raise TProtocol.TProtocolException(message='Required field applicationId is unset!')
+ if self.projectName is None:
+ raise TProtocol.TProtocolException(message='Required field projectName is unset!')
if self.limit is None:
raise TProtocol.TProtocolException(message='Required field limit is unset!')
if self.offset is None:
@@ -22488,7 +20710,7 @@ class searchExperimentsByApplication_args:
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.applicationId)
+ value = (value * 31) ^ hash(self.projectName)
value = (value * 31) ^ hash(self.limit)
value = (value * 31) ^ hash(self.offset)
return value
@@ -22504,7 +20726,7 @@ class searchExperimentsByApplication_args:
def __ne__(self, other):
return not (self == other)
-class searchExperimentsByApplication_result:
+class searchProjectsByProjectName_result:
"""
Attributes:
- success
@@ -22515,7 +20737,7 @@ class searchExperimentsByApplication_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -22541,11 +20763,11 @@ class searchExperimentsByApplication_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype77, _size74) = iprot.readListBegin()
- for _i78 in xrange(_size74):
- _elem79 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem79.read(iprot)
- self.success.append(_elem79)
+ (_etype49, _size46) = iprot.readListBegin()
+ for _i50 in xrange(_size46):
+ _elem51 = apache.airavata.model.workspace.ttypes.Project()
+ _elem51.read(iprot)
+ self.success.append(_elem51)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22582,12 +20804,12 @@ class searchExperimentsByApplication_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByApplication_result')
+ oprot.writeStructBegin('searchProjectsByProjectName_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter80 in self.success:
- iter80.write(oprot)
+ for iter52 in self.success:
+ iter52.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22633,13 +20855,13 @@ class searchExperimentsByApplication_result:
def __ne__(self, other):
return not (self == other)
-class searchExperimentsByStatus_args:
+class searchProjectsByProjectDesc_args:
"""
Attributes:
- authzToken
- gatewayId
- userName
- - experimentState
+ - description
- limit
- offset
"""
@@ -22649,16 +20871,16 @@ class searchExperimentsByStatus_args:
(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
- (4, TType.I32, 'experimentState', None, None, ), # 4
+ (4, TType.STRING, 'description', None, None, ), # 4
(5, TType.I32, 'limit', None, None, ), # 5
(6, TType.I32, 'offset', None, None, ), # 6
)
- def __init__(self, authzToken=None, gatewayId=None, userName=None, experimentState=None, limit=None, offset=None,):
+ def __init__(self, authzToken=None, gatewayId=None, userName=None, description=None, limit=None, offset=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
self.userName = userName
- self.experimentState = experimentState
+ self.description = description
self.limit = limit
self.offset = offset
@@ -22688,8 +20910,8 @@ class searchExperimentsByStatus_args:
else:
iprot.skip(ftype)
elif fid == 4:
- if ftype == TType.I32:
- self.experimentState = iprot.readI32()
+ if ftype == TType.STRING:
+ self.description = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 5:
@@ -22711,7 +20933,7 @@ class searchExperimentsByStatus_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchExperimentsByStatus_args')
+ oprot.writeStructBegin('searchProjectsByProjectDesc_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22724,9 +20946,9 @@ class searchExperimentsByStatus_args:
oprot.writeFieldBegin('userName', TType.STRING, 3)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.experimentState is not None:
- oprot.writeFieldBegin('experimentState', TType.I32, 4)
- oprot.writeI32(self.experimentState)
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 4)
+ oprot.writeString(self.description)
oprot.writeFieldEnd()
if self.limit is not None:
oprot.writeFieldBegin('limit', TType.I32, 5)
@@ -22746,294 +20968,8 @@ class searchExperimentsByStatus_args:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.userName is None:
raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.experimentState is None:
- raise TProtocol.TProtocolException(message='Required field experimentState is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.experimentState)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 searchExperimentsByStatus_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype84, _size81) = iprot.readListBegin()
- for _i85 in xrange(_size81):
- _elem86 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem86.read(iprot)
- self.success.append(_elem86)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('searchExperimentsByStatus_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter87 in self.success:
- iter87.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- o
<TRUNCATED>
[29/53] [abbrv] airavata git commit: fixing test failure
Posted by sh...@apache.org.
fixing test failure
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b450b85a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b450b85a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b450b85a
Branch: refs/heads/master
Commit: b450b85a4780b62c14904f24f87a5bac0e0cd316
Parents: 49dfd42
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:17:45 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:17:45 2016 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchBES.java | 75 -------------------
.../client/samples/CreateLaunchExperiment.java | 76 --------------------
2 files changed, 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b450b85a/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 2f91ee0..4f96868 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
@@ -372,81 +372,6 @@ public class CreateLaunchBES {
return null;
}
- public static List<Project> searchProjectsByProjectName(Airavata.Client client, String user, String projectName) {
- try {
- return client.searchProjectsByProjectName(new AuthzToken(""), DEFAULT_GATEWAY, user, projectName, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<Project> searchProjectsByProjectDesc(Airavata.Client client, String user, String desc) {
- try {
- return client.searchProjectsByProjectDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
-
- public static List<ExperimentSummaryModel> searchExperimentsByName(Airavata.Client client, String user, String expName) {
- try {
- return client.searchExperimentsByName(new AuthzToken(""), DEFAULT_GATEWAY, user, expName, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummaryModel> searchExperimentsByDesc(Airavata.Client client, String user, String desc) {
- try {
- return client.searchExperimentsByDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummaryModel> searchExperimentsByApplication(Airavata.Client client, String user, String app) {
- try {
- return client.searchExperimentsByApplication(new AuthzToken(""), DEFAULT_GATEWAY, user, app, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
public static void getExperiment(Airavata.Client client, String expId) throws Exception {
try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b450b85a/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 256e64e..11c84a4 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
@@ -1505,82 +1505,6 @@ public class CreateLaunchExperiment {
return null;
}
- public static List<Project> searchProjectsByProjectName(Airavata.Client client, String user, String projectName) {
- try {
- return client.searchProjectsByProjectName(new AuthzToken(""), DEFAULT_GATEWAY, user, projectName, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<Project> searchProjectsByProjectDesc(Airavata.Client client, String user, String desc) {
- try {
- return client.searchProjectsByProjectDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
-
- public static List<ExperimentSummaryModel> searchExperimentsByName(Airavata.Client client, String user, String expName) {
- try {
- return client.searchExperimentsByName(new AuthzToken(""), DEFAULT_GATEWAY, user, expName, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummaryModel> searchExperimentsByDesc(Airavata.Client client, String user, String desc) {
- try {
- return client.searchExperimentsByDesc(new AuthzToken(""), DEFAULT_GATEWAY, user, desc, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummaryModel> searchExperimentsByApplication(Airavata.Client client, String user, String app) {
- try {
- return client.searchExperimentsByApplication(new AuthzToken(""), DEFAULT_GATEWAY, user, app, -1, 0);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- } catch (TException e) {
- e.printStackTrace();
- }
- return null;
- }
-
public static void getExperiment(Airavata.Client client, String expId) throws Exception {
try {
ExperimentModel experiment = client.getExperiment(new AuthzToken(""), expId);
[44/53] [abbrv] airavata git commit: Added URI_COLLECTION Data type
Posted by sh...@apache.org.
Added URI_COLLECTION Data type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/56450315
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/56450315
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/56450315
Branch: refs/heads/master
Commit: 56450315aef0d51df8107eba750886aa43bedf25
Parents: 94a9fca
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jul 5 11:29:09 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 5 11:29:09 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 44 +++++-----
.../src/main/resources/lib/airavata/Airavata.h | 42 +++++-----
.../lib/airavata/Airavata_server.skeleton.cpp | 42 +++++-----
.../airavata/application_io_models_types.cpp | 4 +-
.../lib/airavata/application_io_models_types.h | 5 +-
.../resources/lib/Airavata/API/Airavata.php | 42 +++++-----
.../lib/Airavata/Model/Application/Io/Types.php | 10 ++-
.../lib/apache/airavata/api/Airavata.py | 84 ++++++++++----------
.../airavata/model/application/io/ttypes.py | 15 ++--
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../airavata/model/application/io/DataType.java | 9 ++-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../application_io_models.thrift | 1 +
96 files changed, 240 insertions(+), 228 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 91a2fc6..35b03fd 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class Airavata {
public interface Iface {
@@ -422,27 +422,27 @@ public class Airavata {
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;
/**
- * *
- * * Search User Projects
- * * Search and get all Projects for user by project description or/and project name with pagination.
- * * Results will be ordered based on creation time DESC.
- * *
- * * @param gatewayId
- * * The unique identifier of the gateway making the request.
- * *
- * * @param userName
- * * The identifier of the user.
- * *
- * * @param filters
- * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- * *
- * * @param limit
- * * The amount results to be fetched.
- * *
- * * @param offset
- * * The starting point of the results to be fetched.
- * *
- * *
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
*
* @param authzToken
* @param gatewayId
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 d68a61d..dfe3f0d 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
@@ -399,27 +399,27 @@ class AiravataIf {
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;
/**
- * *
- * * Search User Projects
- * * Search and get all Projects for user by project description or/and project name with pagination.
- * * Results will be ordered based on creation time DESC.
- * *
- * * @param gatewayId
- * * The unique identifier of the gateway making the request.
- * *
- * * @param userName
- * * The identifier of the user.
- * *
- * * @param filters
- * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- * *
- * * @param limit
- * * The amount results to be fetched.
- * *
- * * @param offset
- * * The starting point of the results to be fetched.
- * *
- * *
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
*
* @param authzToken
* @param gatewayId
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 18de3bb..66d0df9 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
@@ -483,27 +483,27 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
- * *
- * * Search User Projects
- * * Search and get all Projects for user by project description or/and project name with pagination.
- * * Results will be ordered based on creation time DESC.
- * *
- * * @param gatewayId
- * * The unique identifier of the gateway making the request.
- * *
- * * @param userName
- * * The identifier of the user.
- * *
- * * @param filters
- * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- * *
- * * @param limit
- * * The amount results to be fetched.
- * *
- * * @param offset
- * * The starting point of the results to be fetched.
- * *
- * *
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
*
* @param authzToken
* @param gatewayId
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp
index 15baf31..769938e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.cpp
@@ -35,6 +35,7 @@ int _kDataTypeValues[] = {
DataType::INTEGER,
DataType::FLOAT,
DataType::URI,
+ DataType::URI_COLLECTION,
DataType::STDOUT,
DataType::STDERR
};
@@ -43,10 +44,11 @@ const char* _kDataTypeNames[] = {
"INTEGER",
"FLOAT",
"URI",
+ "URI_COLLECTION",
"STDOUT",
"STDERR"
};
-const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _DataType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kDataTypeValues, _kDataTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
InputDataObjectType::~InputDataObjectType() throw() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.h
index 5a52589..89aecb8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_io_models_types.h
@@ -43,8 +43,9 @@ struct DataType {
INTEGER = 1,
FLOAT = 2,
URI = 3,
- STDOUT = 4,
- STDERR = 5
+ URI_COLLECTION = 4,
+ STDOUT = 5,
+ STDERR = 6
};
};
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 690b75b..cebfb90 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
@@ -508,27 +508,27 @@ interface AiravataIf {
*/
public function getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
/**
- * *
- * * Search User Projects
- * * Search and get all Projects for user by project description or/and project name with pagination.
- * * Results will be ordered based on creation time DESC.
- * *
- * * @param gatewayId
- * * The unique identifier of the gateway making the request.
- * *
- * * @param userName
- * * The identifier of the user.
- * *
- * * @param filters
- * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- * *
- * * @param limit
- * * The amount results to be fetched.
- * *
- * * @param offset
- * * The starting point of the results to be fetched.
- * *
- * *
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php
index b2890c1..fae8964 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Application/Io/Types.php
@@ -26,15 +26,17 @@ final class DataType {
const INTEGER = 1;
const FLOAT = 2;
const URI = 3;
- const STDOUT = 4;
- const STDERR = 5;
+ const URI_COLLECTION = 4;
+ const STDOUT = 5;
+ const STDERR = 6;
static public $__names = array(
0 => 'STRING',
1 => 'INTEGER',
2 => 'FLOAT',
3 => 'URI',
- 4 => 'STDOUT',
- 5 => 'STDERR',
+ 4 => 'URI_COLLECTION',
+ 5 => 'STDOUT',
+ 6 => 'STDERR',
);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 c1d24c1..a73f2c1 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
@@ -465,27 +465,27 @@ class Iface:
def searchProjects(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
- *
- * Search User Projects
- * Search and get all Projects for user by project description or/and project name with pagination.
- * Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param filters
- * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+
+ Search User Projects
+ Search and get all Projects for user by project description or/and project name with pagination.
+ Results will be ordered based on creation time DESC.
+
+ @param gatewayId
+ The unique identifier of the gateway making the request.
+
+ @param userName
+ The identifier of the user.
+
+ @param filters
+ Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+
+ @param limit
+ The amount results to be fetched.
+
+ @param offset
+ The starting point of the results to be fetched.
+
+
Parameters:
- authzToken
@@ -4161,27 +4161,27 @@ class Client(Iface):
def searchProjects(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
- *
- * Search User Projects
- * Search and get all Projects for user by project description or/and project name with pagination.
- * Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param filters
- * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+
+ Search User Projects
+ Search and get all Projects for user by project description or/and project name with pagination.
+ Results will be ordered based on creation time DESC.
+
+ @param gatewayId
+ The unique identifier of the gateway making the request.
+
+ @param userName
+ The identifier of the user.
+
+ @param filters
+ Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+
+ @param limit
+ The amount results to be fetched.
+
+ @param offset
+ The starting point of the results to be fetched.
+
+
Parameters:
- authzToken
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/application/io/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/application/io/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/application/io/ttypes.py
index 9a2cedf..3b255a5 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/application/io/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/application/io/ttypes.py
@@ -27,16 +27,18 @@ class DataType:
INTEGER = 1
FLOAT = 2
URI = 3
- STDOUT = 4
- STDERR = 5
+ URI_COLLECTION = 4
+ STDOUT = 5
+ STDERR = 6
_VALUES_TO_NAMES = {
0: "STRING",
1: "INTEGER",
2: "FLOAT",
3: "URI",
- 4: "STDOUT",
- 5: "STDERR",
+ 4: "URI_COLLECTION",
+ 5: "STDOUT",
+ 6: "STDERR",
}
_NAMES_TO_VALUES = {
@@ -44,8 +46,9 @@ class DataType:
"INTEGER": 1,
"FLOAT": 2,
"URI": 3,
- "STDOUT": 4,
- "STDERR": 5,
+ "URI_COLLECTION": 4,
+ "STDOUT": 5,
+ "STDERR": 6,
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index 900bf6d..c8cf23b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index ce38569..319bce0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index 282ca7c..504aca0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 9900063..6b0a24c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 572cd40..80ff137 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index cb119c7..6a6b7d9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 e95ee37..b5d3a0d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 acb89d3..7e5a9c4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 4e4db6b..b39c33e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 b6491da..ec9e43e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 ffd2732..656aa91 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 2a9bfaa..4bc3759 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 e17a7f3..1d7ead2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 2c8eb50..734f811 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 3c26935..848d67d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 48c480f..5efce96 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 eb8a96e..79921f0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 931ee3f..a23ce6b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 8aa6023..fcde9cf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 da7dce3..4a1e226 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 6f8b568..92fbe10 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 6faf1df..6d8eb1e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index 1a01f69..a6ba128 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index 9f7aed3..45e1fb9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
index d18f349..8bef839 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/DataType.java
@@ -37,8 +37,9 @@ public enum DataType implements org.apache.thrift.TEnum {
INTEGER(1),
FLOAT(2),
URI(3),
- STDOUT(4),
- STDERR(5);
+ URI_COLLECTION(4),
+ STDOUT(5),
+ STDERR(6);
private final int value;
@@ -68,8 +69,10 @@ public enum DataType implements org.apache.thrift.TEnum {
case 3:
return URI;
case 4:
- return STDOUT;
+ return URI_COLLECTION;
case 5:
+ return STDOUT;
+ case 6:
return STDERR;
default:
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 9c58d01..5607ce8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 c04162c..6b20f57 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 194de57..66ee2a4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 8b407cb..e0539ac 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 bd14531..623eef5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 574ac82..61cb093 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index a2fbedc..0888ebe 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index f69f87a..e5aeb25 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index 5a8f279..a10d18c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 1548f26..9a8128a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index 448cc72..bfab932 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index 10d292b..b31b954 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 077f107..28f426e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 ed5aba9..1ad8c4d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 9613aea..4e4e109 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 070c51a..48b7ceb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 51fae23..b951554 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 a1724a2..a43d0f7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 1e0c429..2684b47 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 5f6c416..c9d9660 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 ed468cf..581c2c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 073bbca..6cf6f12 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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");
[52/53] [abbrv] airavata git commit: fixing NPE
Posted by sh...@apache.org.
fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0bc5513e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0bc5513e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0bc5513e
Branch: refs/heads/master
Commit: 0bc5513ecf5fe671b733b56ef6c3344c416ab244
Parents: 7addfd9
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 6 16:31:24 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 6 16:31:24 2016 -0400
----------------------------------------------------------------------
.../registry/core/app/catalog/resources/AppInterfaceResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0bc5513e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
index 3287eab..47d4205 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
@@ -389,7 +389,7 @@ public class AppInterfaceResource extends AppCatAbstractResource {
applicationInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
applicationInterface.setGatewayId(gatewayId);
applicationInterface.setArchiveWorkingDirectory(archiveWorkingDirectory);
- existigAppInterface.setHasOptionalFileInputs(hasOptionalFileInputs);
+ applicationInterface.setHasOptionalFileInputs(hasOptionalFileInputs);
em.persist(applicationInterface);
}
em.getTransaction().commit();
[17/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 553f1e5..a2e1f31 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
@@ -8705,11 +8705,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::pr
}
-Airavata_searchExperimentsByName_args::~Airavata_searchExperimentsByName_args() throw() {
+Airavata_searchExperiments_args::~Airavata_searchExperiments_args() throw() {
}
-uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -8724,7 +8724,6 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_expName = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -8761,9 +8760,26 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
}
break;
case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->expName);
- isset_expName = true;
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->filters.clear();
+ uint32_t _size96;
+ ::apache::thrift::protocol::TType _ktype97;
+ ::apache::thrift::protocol::TType _vtype98;
+ xfer += iprot->readMapBegin(_ktype97, _vtype98, _size96);
+ uint32_t _i100;
+ for (_i100 = 0; _i100 < _size96; ++_i100)
+ {
+ ::apache::airavata::model::experiment::ExperimentSearchFields::type _key101;
+ int32_t ecast103;
+ xfer += iprot->readI32(ecast103);
+ _key101 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast103;
+ std::string& _val102 = this->filters[_key101];
+ xfer += iprot->readString(_val102);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.filters = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -8799,8 +8815,6 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_expName)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_offset)
@@ -8808,10 +8822,10 @@ uint32_t Airavata_searchExperimentsByName_args::read(::apache::thrift::protocol:
return xfer;
}
-uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_args");
+ xfer += oprot->writeStructBegin("Airavata_searchExperiments_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -8825,8 +8839,17 @@ uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol
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("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 _iter104;
+ for (_iter104 = this->filters.begin(); _iter104 != this->filters.end(); ++_iter104)
+ {
+ xfer += oprot->writeI32((int32_t)_iter104->first);
+ xfer += oprot->writeString(_iter104->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -8843,14 +8866,14 @@ uint32_t Airavata_searchExperimentsByName_args::write(::apache::thrift::protocol
}
-Airavata_searchExperimentsByName_pargs::~Airavata_searchExperimentsByName_pargs() throw() {
+Airavata_searchExperiments_pargs::~Airavata_searchExperiments_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchExperiments_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -8864,8 +8887,17 @@ uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protoco
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("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 _iter105;
+ for (_iter105 = (*(this->filters)).begin(); _iter105 != (*(this->filters)).end(); ++_iter105)
+ {
+ xfer += oprot->writeI32((int32_t)_iter105->first);
+ xfer += oprot->writeString(_iter105->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -8882,11 +8914,11 @@ uint32_t Airavata_searchExperimentsByName_pargs::write(::apache::thrift::protoco
}
-Airavata_searchExperimentsByName_result::~Airavata_searchExperimentsByName_result() throw() {
+Airavata_searchExperiments_result::~Airavata_searchExperiments_result() throw() {
}
-uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperiments_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -8911,14 +8943,14 @@ uint32_t Airavata_searchExperimentsByName_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size96;
- ::apache::thrift::protocol::TType _etype99;
- xfer += iprot->readListBegin(_etype99, _size96);
- this->success.resize(_size96);
- uint32_t _i100;
- for (_i100 = 0; _i100 < _size96; ++_i100)
+ uint32_t _size106;
+ ::apache::thrift::protocol::TType _etype109;
+ xfer += iprot->readListBegin(_etype109, _size106);
+ this->success.resize(_size106);
+ uint32_t _i110;
+ for (_i110 = 0; _i110 < _size106; ++_i110)
{
- xfer += this->success[_i100].read(iprot);
+ xfer += this->success[_i110].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8971,20 +9003,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_searchExperiments_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByName_result");
+ xfer += oprot->writeStructBegin("Airavata_searchExperiments_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 _iter101;
- for (_iter101 = this->success.begin(); _iter101 != this->success.end(); ++_iter101)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter111;
+ for (_iter111 = this->success.begin(); _iter111 != this->success.end(); ++_iter111)
{
- xfer += (*_iter101).write(oprot);
+ xfer += (*_iter111).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9012,11 +9044,11 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
}
-Airavata_searchExperimentsByName_presult::~Airavata_searchExperimentsByName_presult() throw() {
+Airavata_searchExperiments_presult::~Airavata_searchExperiments_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchExperiments_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9041,14 +9073,14 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size102;
- ::apache::thrift::protocol::TType _etype105;
- xfer += iprot->readListBegin(_etype105, _size102);
- (*(this->success)).resize(_size102);
- uint32_t _i106;
- for (_i106 = 0; _i106 < _size102; ++_i106)
+ uint32_t _size112;
+ ::apache::thrift::protocol::TType _etype115;
+ xfer += iprot->readListBegin(_etype115, _size112);
+ (*(this->success)).resize(_size112);
+ uint32_t _i116;
+ for (_i116 = 0; _i116 < _size112; ++_i116)
{
- xfer += (*(this->success))[_i106].read(iprot);
+ xfer += (*(this->success))[_i116].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9102,11 +9134,11 @@ uint32_t Airavata_searchExperimentsByName_presult::read(::apache::thrift::protoc
}
-Airavata_searchExperimentsByDesc_args::~Airavata_searchExperimentsByDesc_args() throw() {
+Airavata_getExperimentStatistics_args::~Airavata_getExperimentStatistics_args() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentStatistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9120,10 +9152,8 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
bool isset_authzToken = false;
bool isset_gatewayId = false;
- bool isset_userName = false;
- bool isset_description = false;
- bool isset_limit = false;
- bool isset_offset = false;
+ bool isset_fromTime = false;
+ bool isset_toTime = false;
while (true)
{
@@ -9150,33 +9180,17 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
}
break;
case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
+ if (ftype == ::apache::thrift::protocol::T_I64) {
+ xfer += iprot->readI64(this->fromTime);
+ isset_fromTime = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- 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;
+ if (ftype == ::apache::thrift::protocol::T_I64) {
+ xfer += iprot->readI64(this->toTime);
+ isset_toTime = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -9194,21 +9208,17 @@ uint32_t Airavata_searchExperimentsByDesc_args::read(::apache::thrift::protocol:
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)
+ if (!isset_fromTime)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_offset)
+ if (!isset_toTime)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchExperimentsByDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentStatistics_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_args");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -9218,20 +9228,12 @@ uint32_t Airavata_searchExperimentsByDesc_args::write(::apache::thrift::protocol
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();
-
- 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->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 3);
+ xfer += oprot->writeI64(this->fromTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
- xfer += oprot->writeI32(this->offset);
+ xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 4);
+ xfer += oprot->writeI64(this->toTime);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -9240,14 +9242,14 @@ uint32_t Airavata_searchExperimentsByDesc_args::write(::apache::thrift::protocol
}
-Airavata_searchExperimentsByDesc_pargs::~Airavata_searchExperimentsByDesc_pargs() throw() {
+Airavata_getExperimentStatistics_pargs::~Airavata_getExperimentStatistics_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentStatistics_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -9257,20 +9259,12 @@ uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protoco
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();
-
- 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->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 3);
+ xfer += oprot->writeI64((*(this->fromTime)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 6);
- xfer += oprot->writeI32((*(this->offset)));
+ xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 4);
+ xfer += oprot->writeI64((*(this->toTime)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -9279,11 +9273,11 @@ uint32_t Airavata_searchExperimentsByDesc_pargs::write(::apache::thrift::protoco
}
-Airavata_searchExperimentsByDesc_result::~Airavata_searchExperimentsByDesc_result() throw() {
+Airavata_getExperimentStatistics_result::~Airavata_getExperimentStatistics_result() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentStatistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9305,20 +9299,8 @@ uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protoco
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size107;
- ::apache::thrift::protocol::TType _etype110;
- xfer += iprot->readListBegin(_etype110, _size107);
- this->success.resize(_size107);
- uint32_t _i111;
- for (_i111 = 0; _i111 < _size107; ++_i111)
- {
- xfer += this->success[_i111].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -9368,23 +9350,15 @@ uint32_t Airavata_searchExperimentsByDesc_result::read(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentStatistics_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByDesc_result");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_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 _iter112;
- for (_iter112 = this->success.begin(); _iter112 != this->success.end(); ++_iter112)
- {
- xfer += (*_iter112).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -9409,11 +9383,11 @@ uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protoc
}
-Airavata_searchExperimentsByDesc_presult::~Airavata_searchExperimentsByDesc_presult() throw() {
+Airavata_getExperimentStatistics_presult::~Airavata_getExperimentStatistics_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByDesc_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentStatistics_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9435,20 +9409,8 @@ uint32_t Airavata_searchExperimentsByDesc_presult::read(::apache::thrift::protoc
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size113;
- ::apache::thrift::protocol::TType _etype116;
- xfer += iprot->readListBegin(_etype116, _size113);
- (*(this->success)).resize(_size113);
- uint32_t _i117;
- for (_i117 = 0; _i117 < _size113; ++_i117)
- {
- xfer += (*(this->success))[_i117].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -9499,11 +9461,11 @@ uint32_t Airavata_searchExperimentsByDesc_presult::read(::apache::thrift::protoc
}
-Airavata_searchExperimentsByApplication_args::~Airavata_searchExperimentsByApplication_args() throw() {
+Airavata_getExperimentsInProject_args::~Airavata_getExperimentsInProject_args() throw() {
}
-uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentsInProject_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9516,9 +9478,7 @@ uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::pr
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_gatewayId = false;
- bool isset_userName = false;
- bool isset_applicationId = false;
+ bool isset_projectId = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -9540,29 +9500,13 @@ uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::pr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
+ xfer += iprot->readString(this->projectId);
+ isset_projectId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->applicationId);
- isset_applicationId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 5:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->limit);
isset_limit = true;
@@ -9570,7 +9514,7 @@ uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::pr
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->offset);
isset_offset = true;
@@ -9589,11 +9533,7 @@ uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::pr
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_applicationId)
+ if (!isset_projectId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -9602,32 +9542,24 @@ uint32_t Airavata_searchExperimentsByApplication_args::read(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_searchExperimentsByApplication_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentsInProject_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_args");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentsInProject_args");
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, 3);
- xfer += oprot->writeString(this->userName);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->applicationId);
+ xfer += oprot->writeFieldBegin("projectId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->projectId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 3);
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, 4);
xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
@@ -9637,36 +9569,28 @@ uint32_t Airavata_searchExperimentsByApplication_args::write(::apache::thrift::p
}
-Airavata_searchExperimentsByApplication_pargs::~Airavata_searchExperimentsByApplication_pargs() throw() {
+Airavata_getExperimentsInProject_pargs::~Airavata_getExperimentsInProject_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByApplication_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentsInProject_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentsInProject_pargs");
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, 3);
- xfer += oprot->writeString((*(this->userName)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("applicationId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->applicationId)));
+ xfer += oprot->writeFieldBegin("projectId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->projectId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
+ xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 3);
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, 4);
xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
@@ -9676,11 +9600,11 @@ uint32_t Airavata_searchExperimentsByApplication_pargs::write(::apache::thrift::
}
-Airavata_searchExperimentsByApplication_result::~Airavata_searchExperimentsByApplication_result() throw() {
+Airavata_getExperimentsInProject_result::~Airavata_getExperimentsInProject_result() throw() {
}
-uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9705,14 +9629,14 @@ uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size118;
- ::apache::thrift::protocol::TType _etype121;
- xfer += iprot->readListBegin(_etype121, _size118);
- this->success.resize(_size118);
- uint32_t _i122;
- for (_i122 = 0; _i122 < _size118; ++_i122)
+ uint32_t _size117;
+ ::apache::thrift::protocol::TType _etype120;
+ xfer += iprot->readListBegin(_etype120, _size117);
+ this->success.resize(_size117);
+ uint32_t _i121;
+ for (_i121 = 0; _i121 < _size117; ++_i121)
{
- xfer += this->success[_i122].read(iprot);
+ xfer += this->success[_i121].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9747,6 +9671,14 @@ uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->pnfe.read(iprot);
+ this->__isset.pnfe = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ae.read(iprot);
this->__isset.ae = true;
} else {
@@ -9765,20 +9697,20 @@ uint32_t Airavata_searchExperimentsByApplication_result::read(::apache::thrift::
return xfer;
}
-uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperimentsInProject_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByApplication_result");
+ xfer += oprot->writeStructBegin("Airavata_getExperimentsInProject_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 _iter123;
- for (_iter123 = this->success.begin(); _iter123 != this->success.end(); ++_iter123)
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter122;
+ for (_iter122 = this->success.begin(); _iter122 != this->success.end(); ++_iter122)
{
- xfer += (*_iter123).write(oprot);
+ xfer += (*_iter122).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9795,8 +9727,12 @@ uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift:
xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
xfer += this->ase.write(oprot);
xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.pnfe) {
+ xfer += oprot->writeFieldBegin("pnfe", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->pnfe.write(oprot);
+ xfer += oprot->writeFieldEnd();
} else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 5);
xfer += this->ae.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -9806,11 +9742,11 @@ uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift:
}
-Airavata_searchExperimentsByApplication_presult::~Airavata_searchExperimentsByApplication_presult() throw() {
+Airavata_getExperimentsInProject_presult::~Airavata_getExperimentsInProject_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperimentsInProject_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9835,14 +9771,14 @@ uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size124;
- ::apache::thrift::protocol::TType _etype127;
- xfer += iprot->readListBegin(_etype127, _size124);
- (*(this->success)).resize(_size124);
- uint32_t _i128;
- for (_i128 = 0; _i128 < _size124; ++_i128)
+ uint32_t _size123;
+ ::apache::thrift::protocol::TType _etype126;
+ xfer += iprot->readListBegin(_etype126, _size123);
+ (*(this->success)).resize(_size123);
+ uint32_t _i127;
+ for (_i127 = 0; _i127 < _size123; ++_i127)
{
- xfer += (*(this->success))[_i128].read(iprot);
+ xfer += (*(this->success))[_i127].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9877,6 +9813,14 @@ uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift:
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->pnfe.read(iprot);
+ this->__isset.pnfe = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ae.read(iprot);
this->__isset.ae = true;
} else {
@@ -9896,11 +9840,11 @@ uint32_t Airavata_searchExperimentsByApplication_presult::read(::apache::thrift:
}
-Airavata_searchExperimentsByStatus_args::~Airavata_searchExperimentsByStatus_args() throw() {
+Airavata_getUserExperiments_args::~Airavata_getUserExperiments_args() throw() {
}
-uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserExperiments_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -9915,7 +9859,6 @@ uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protoco
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_experimentState = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -9953,23 +9896,13 @@ uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protoco
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast129;
- xfer += iprot->readI32(ecast129);
- this->experimentState = ( ::apache::airavata::model::status::ExperimentState::type)ecast129;
- 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:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_I32) {
xfer += iprot->readI32(this->offset);
isset_offset = true;
@@ -9992,8 +9925,6 @@ uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protoco
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_experimentState)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_limit)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_offset)
@@ -10001,10 +9932,10 @@ uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_searchExperimentsByStatus_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserExperiments_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_args");
+ xfer += oprot->writeStructBegin("Airavata_getUserExperiments_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -10018,15 +9949,11 @@ uint32_t Airavata_searchExperimentsByStatus_args::write(::apache::thrift::protoc
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- 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->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, 6);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
xfer += oprot->writeI32(this->offset);
xfer += oprot->writeFieldEnd();
@@ -10036,14 +9963,14 @@ uint32_t Airavata_searchExperimentsByStatus_args::write(::apache::thrift::protoc
}
-Airavata_searchExperimentsByStatus_pargs::~Airavata_searchExperimentsByStatus_pargs() throw() {
+Airavata_getUserExperiments_pargs::~Airavata_getUserExperiments_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByStatus_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserExperiments_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getUserExperiments_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -10057,15 +9984,11 @@ uint32_t Airavata_searchExperimentsByStatus_pargs::write(::apache::thrift::proto
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- 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->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, 6);
+ xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 5);
xfer += oprot->writeI32((*(this->offset)));
xfer += oprot->writeFieldEnd();
@@ -10075,11 +9998,11 @@ uint32_t Airavata_searchExperimentsByStatus_pargs::write(::apache::thrift::proto
}
-Airavata_searchExperimentsByStatus_result::~Airavata_searchExperimentsByStatus_result() throw() {
+Airavata_getUserExperiments_result::~Airavata_getUserExperiments_result() throw() {
}
-uint32_t Airavata_searchExperimentsByStatus_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserExperiments_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10104,14 +10027,14 @@ uint32_t Airavata_searchExperimentsByStatus_result::read(::apache::thrift::proto
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size130;
- ::apache::thrift::protocol::TType _etype133;
- xfer += iprot->readListBegin(_etype133, _size130);
- this->success.resize(_size130);
- uint32_t _i134;
- for (_i134 = 0; _i134 < _size130; ++_i134)
+ uint32_t _size128;
+ ::apache::thrift::protocol::TType _etype131;
+ xfer += iprot->readListBegin(_etype131, _size128);
+ this->success.resize(_size128);
+ uint32_t _i132;
+ for (_i132 = 0; _i132 < _size128; ++_i132)
{
- xfer += this->success[_i134].read(iprot);
+ xfer += this->success[_i132].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -10164,20 +10087,20 @@ uint32_t Airavata_searchExperimentsByStatus_result::read(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_searchExperimentsByStatus_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUserExperiments_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByStatus_result");
+ xfer += oprot->writeStructBegin("Airavata_getUserExperiments_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 _iter135;
- for (_iter135 = this->success.begin(); _iter135 != this->success.end(); ++_iter135)
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter133;
+ for (_iter133 = this->success.begin(); _iter133 != this->success.end(); ++_iter133)
{
- xfer += (*_iter135).write(oprot);
+ xfer += (*_iter133).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -10205,11 +10128,11 @@ uint32_t Airavata_searchExperimentsByStatus_result::write(::apache::thrift::prot
}
-Airavata_searchExperimentsByStatus_presult::~Airavata_searchExperimentsByStatus_presult() throw() {
+Airavata_getUserExperiments_presult::~Airavata_getUserExperiments_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByStatus_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUserExperiments_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10234,14 +10157,14 @@ uint32_t Airavata_searchExperimentsByStatus_presult::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size136;
- ::apache::thrift::protocol::TType _etype139;
- xfer += iprot->readListBegin(_etype139, _size136);
- (*(this->success)).resize(_size136);
- uint32_t _i140;
- for (_i140 = 0; _i140 < _size136; ++_i140)
+ uint32_t _size134;
+ ::apache::thrift::protocol::TType _etype137;
+ xfer += iprot->readListBegin(_etype137, _size134);
+ (*(this->success)).resize(_size134);
+ uint32_t _i138;
+ for (_i138 = 0; _i138 < _size134; ++_i138)
{
- xfer += (*(this->success))[_i140].read(iprot);
+ xfer += (*(this->success))[_i138].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -10295,11 +10218,11 @@ uint32_t Airavata_searchExperimentsByStatus_presult::read(::apache::thrift::prot
}
-Airavata_searchExperimentsByCreationTime_args::~Airavata_searchExperimentsByCreationTime_args() throw() {
+Airavata_createExperiment_args::~Airavata_createExperiment_args() throw() {
}
-uint32_t Airavata_searchExperimentsByCreationTime_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createExperiment_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10313,11 +10236,7 @@ uint32_t Airavata_searchExperimentsByCreationTime_args::read(::apache::thrift::p
bool isset_authzToken = false;
bool isset_gatewayId = false;
- bool isset_userName = false;
- bool isset_fromTime = false;
- bool isset_toTime = false;
- bool isset_limit = false;
- bool isset_offset = false;
+ bool isset_experiment = false;
while (true)
{
@@ -10344,41 +10263,9 @@ uint32_t Airavata_searchExperimentsByCreationTime_args::read(::apache::thrift::p
}
break;
case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- 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;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 7:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->offset);
- isset_offset = true;
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->experiment.read(iprot);
+ isset_experiment = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -10396,23 +10283,15 @@ uint32_t Airavata_searchExperimentsByCreationTime_args::read(::apache::thrift::p
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userName)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_fromTime)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_toTime)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_limit)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_offset)
+ if (!isset_experiment)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchExperimentsByCreationTime_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createExperiment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_args");
+ xfer += oprot->writeStructBegin("Airavata_createExperiment_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -10422,24 +10301,8 @@ uint32_t Airavata_searchExperimentsByCreationTime_args::write(::apache::thrift::
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();
-
- xfer += oprot->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 4);
- xfer += oprot->writeI64(this->fromTime);
- xfer += oprot->writeFieldEnd();
-
- 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, 7);
- xfer += oprot->writeI32(this->offset);
+ xfer += oprot->writeFieldBegin("experiment", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->experiment.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -10448,14 +10311,14 @@ uint32_t Airavata_searchExperimentsByCreationTime_args::write(::apache::thrift::
}
-Airavata_searchExperimentsByCreationTime_pargs::~Airavata_searchExperimentsByCreationTime_pargs() throw() {
+Airavata_createExperiment_pargs::~Airavata_createExperiment_pargs() throw() {
}
-uint32_t Airavata_searchExperimentsByCreationTime_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createExperiment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_pargs");
+ xfer += oprot->writeStructBegin("Airavata_createExperiment_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -10465,24 +10328,8 @@ uint32_t Airavata_searchExperimentsByCreationTime_pargs::write(::apache::thrift:
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();
-
- xfer += oprot->writeFieldBegin("fromTime", ::apache::thrift::protocol::T_I64, 4);
- xfer += oprot->writeI64((*(this->fromTime)));
- xfer += oprot->writeFieldEnd();
-
- 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, 7);
- xfer += oprot->writeI32((*(this->offset)));
+ xfer += oprot->writeFieldBegin("experiment", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += (*(this->experiment)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -10491,11 +10338,11 @@ uint32_t Airavata_searchExperimentsByCreationTime_pargs::write(::apache::thrift:
}
-Airavata_searchExperimentsByCreationTime_result::~Airavata_searchExperimentsByCreationTime_result() throw() {
+Airavata_createExperiment_result::~Airavata_createExperiment_result() throw() {
}
-uint32_t Airavata_searchExperimentsByCreationTime_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createExperiment_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10517,20 +10364,8 @@ uint32_t Airavata_searchExperimentsByCreationTime_result::read(::apache::thrift:
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size141;
- ::apache::thrift::protocol::TType _etype144;
- xfer += iprot->readListBegin(_etype144, _size141);
- this->success.resize(_size141);
- uint32_t _i145;
- for (_i145 = 0; _i145 < _size141; ++_i145)
- {
- xfer += this->success[_i145].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -10580,23 +10415,15 @@ uint32_t Airavata_searchExperimentsByCreationTime_result::read(::apache::thrift:
return xfer;
}
-uint32_t Airavata_searchExperimentsByCreationTime_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_createExperiment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperimentsByCreationTime_result");
+ xfer += oprot->writeStructBegin("Airavata_createExperiment_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 _iter146;
- for (_iter146 = this->success.begin(); _iter146 != this->success.end(); ++_iter146)
- {
- xfer += (*_iter146).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -10621,11 +10448,11 @@ uint32_t Airavata_searchExperimentsByCreationTime_result::write(::apache::thrift
}
-Airavata_searchExperimentsByCreationTime_presult::~Airavata_searchExperimentsByCreationTime_presult() throw() {
+Airavata_createExperiment_presult::~Airavata_createExperiment_presult() throw() {
}
-uint32_t Airavata_searchExperimentsByCreationTime_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_createExperiment_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10647,20 +10474,8 @@ uint32_t Airavata_searchExperimentsByCreationTime_presult::read(::apache::thrift
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size147;
- ::apache::thrift::protocol::TType _etype150;
- xfer += iprot->readListBegin(_etype150, _size147);
- (*(this->success)).resize(_size147);
- uint32_t _i151;
- for (_i151 = 0; _i151 < _size147; ++_i151)
- {
- xfer += (*(this->success))[_i151].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -10711,11 +10526,11 @@ uint32_t Airavata_searchExperimentsByCreationTime_presult::read(::apache::thrift
}
-Airavata_searchExperiments_args::~Airavata_searchExperiments_args() throw() {
+Airavata_deleteExperiment_args::~Airavata_deleteExperiment_args() throw() {
}
-uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteExperiment_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10728,10 +10543,7 @@ uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProt
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;
+ bool isset_experimentId = false;
while (true)
{
@@ -10751,57 +10563,8 @@ uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProt
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_MAP) {
- {
- this->filters.clear();
- uint32_t _size152;
- ::apache::thrift::protocol::TType _ktype153;
- ::apache::thrift::protocol::TType _vtype154;
- xfer += iprot->readMapBegin(_ktype153, _vtype154, _size152);
- uint32_t _i156;
- for (_i156 = 0; _i156 < _size152; ++_i156)
- {
- ::apache::airavata::model::experiment::ExperimentSearchFields::type _key157;
- int32_t ecast159;
- xfer += iprot->readI32(ecast159);
- _key157 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast159;
- std::string& _val158 = this->filters[_key157];
- xfer += iprot->readString(_val158);
- }
- 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;
+ xfer += iprot->readString(this->experimentId);
+ isset_experimentId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -10817,53 +10580,22 @@ uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProt
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)
+ if (!isset_experimentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteExperiment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperiments_args");
+ xfer += oprot->writeStructBegin("Airavata_deleteExperiment_args");
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, 3);
- xfer += oprot->writeString(this->userName);
- xfer += oprot->writeFieldEnd();
-
- 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 _iter160;
- for (_iter160 = this->filters.begin(); _iter160 != this->filters.end(); ++_iter160)
- {
- xfer += oprot->writeI32((int32_t)_iter160->first);
- xfer += oprot->writeString(_iter160->second);
- }
- xfer += oprot->writeMapEnd();
- }
- 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->writeFieldBegin("experimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->experimentId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -10872,46 +10604,21 @@ uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TPro
}
-Airavata_searchExperiments_pargs::~Airavata_searchExperiments_pargs() throw() {
+Airavata_deleteExperiment_pargs::~Airavata_deleteExperiment_pargs() throw() {
}
-uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteExperiment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchExperiments_pargs");
+ xfer += oprot->writeStructBegin("Airavata_deleteExperiment_pargs");
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, 3);
- xfer += oprot->writeString((*(this->userName)));
- xfer += oprot->writeFieldEnd();
-
- 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 _iter161;
- for (_iter161 = (*(this->filters)).begin(); _iter161 != (*(this->filters)).end(); ++_iter161)
- {
- xfer += oprot->writeI32((int32_t)_iter161->first);
- xfer += oprot->writeString(_iter161->second);
- }
- xfer += oprot->writeMapEnd();
- }
- 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->writeFieldBegin("experimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->experimentId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -10920,11 +10627,11 @@ uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TPr
}
-Airavata_searchExperiments_result::~Airavata_searchExperiments_result() throw() {
+Airavata_deleteExperiment_result::~Airavata_deleteExperiment_result() throw() {
}
-uint32_t Airavata_searchExperiments_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteExperiment_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -10946,20 +10653,8 @@ uint32_t Airavata_searchExperiments_result::read(::apache::thrift::protocol::TPr
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size162;
- ::apache::thrift::protocol::TType _etype165;
- xfer += iprot->readListBegin(_etype165, _size162);
- this->success.resize(_size162);
- uint32_t _i166;
- for (_i166 = 0; _i166 < _size162; ++_i166)
- {
- xfer += this->success[_i166].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -11009,23 +10704,15 @@ uint32_t Airavata_searchExperiments_result::read(::apache::thrift::protocol::TPr
return xfer;
}
-uint32_t Airavata_searchExperiments_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteExperiment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchExperiments_result");
+ xfer += oprot->writeStructBegin("Airavata_deleteExperiment_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 _iter167;
- for (_iter167 = this->success.begin(); _iter167 != this->success.end(); ++_iter167)
- {
- xfer += (*_iter167).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -11050,11 +10737,11 @@ uint32_t Airavata_searchExperiments_result::write(::apache::thrift::protocol::TP
}
-Airavata_searchExperiments_presult::~Airavata_searchExperiments_presult() throw() {
+Airavata_deleteExperiment_presult::~Airavata_deleteExperiment_presult() throw() {
}
-uint32_t Airavata_searchExperiments_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteExperiment_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11076,20 +10763,8 @@ uint32_t Airavata_searchExperiments_presult::read(::apache::thrift::protocol::TP
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size168;
- ::apache::thrift::protocol::TType _etype171;
- xfer += iprot->readListBegin(_etype171, _size168);
- (*(this->success)).resize(_size168);
- uint32_t _i172;
- for (_i172 = 0; _i172 < _size168; ++_i172)
- {
- xfer += (*(this->success))[_i172].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -11140,11 +10815,11 @@ uint32_t Airavata_searchExperiments_presult::read(::apache::thrift::protocol::TP
}
-Airavata_getExperimentStatistics_args::~Airavata_getExperimentStatistics_args() throw() {
+Airavata_getExperiment_args::~Airavata_getExperiment_args() throw() {
}
-uint32_t Airavata_getExperimentStatistics_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperiment_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11157,9 +10832,7 @@ uint32_t Airavata_getExperimentStatistics_args::read(::apache::thrift::protocol:
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_gatewayId = false;
- bool isset_fromTime = false;
- bool isset_toTime = false;
+ bool isset_airavataExperimentId = false;
while (true)
{
@@ -11179,24 +10852,8 @@ uint32_t Airavata_getExperimentStatistics_args::read(::apache::thrift::protocol:
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_I64) {
- xfer += iprot->readI64(this->fromTime);
- isset_fromTime = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_I64) {
- xfer += iprot->readI64(this->toTime);
- isset_toTime = true;
+ xfer += iprot->readString(this->airavataExperimentId);
+ isset_airavataExperimentId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -11212,34 +10869,22 @@ uint32_t Airavata_getExperimentStatistics_args::read(::apache::thrift::protocol:
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_fromTime)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_toTime)
+ if (!isset_airavataExperimentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getExperimentStatistics_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperiment_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_args");
+ xfer += oprot->writeStructBegin("Airavata_getExperiment_args");
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("fromTime", ::apache::thrift::protocol::T_I64, 3);
- xfer += oprot->writeI64(this->fromTime);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 4);
- xfer += oprot->writeI64(this->toTime);
+ xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->airavataExperimentId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -11248,29 +10893,21 @@ uint32_t Airavata_getExperimentStatistics_args::write(::apache::thrift::protocol
}
-Airavata_getExperimentStatistics_pargs::~Airavata_getExperimentStatistics_pargs() throw() {
+Airavata_getExperiment_pargs::~Airavata_getExperiment_pargs() throw() {
}
-uint32_t Airavata_getExperimentStatistics_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperiment_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getExperiment_pargs");
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("fromTime", ::apache::thrift::protocol::T_I64, 3);
- xfer += oprot->writeI64((*(this->fromTime)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("toTime", ::apache::thrift::protocol::T_I64, 4);
- xfer += oprot->writeI64((*(this->toTime)));
+ xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->airavataExperimentId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -11279,11 +10916,11 @@ uint32_t Airavata_getExperimentStatistics_pargs::write(::apache::thrift::protoco
}
-Airavata_getExperimentStatistics_result::~Airavata_getExperimentStatistics_result() throw() {
+Airavata_getExperiment_result::~Airavata_getExperiment_result() throw() {
}
-uint32_t Airavata_getExperimentStatistics_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperiment_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11322,13 +10959,21 @@ uint32_t Airavata_getExperimentStatistics_result::read(::apache::thrift::protoco
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->enf.read(iprot);
+ this->__isset.enf = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ace.read(iprot);
this->__isset.ace = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ase.read(iprot);
this->__isset.ase = true;
@@ -11336,7 +10981,7 @@ uint32_t Airavata_getExperimentStatistics_result::read(::apache::thrift::protoco
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ae.read(iprot);
this->__isset.ae = true;
@@ -11356,11 +11001,11 @@ uint32_t Airavata_getExperimentStatistics_result::read(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_getExperimentStatistics_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getExperiment_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getExperimentStatistics_result");
+ xfer += oprot->writeStructBegin("Airavata_getExperiment_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
@@ -11370,16 +11015,20 @@ uint32_t Airavata_getExperimentStatistics_result::write(::apache::thrift::protoc
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->ire.write(oprot);
xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.enf) {
+ xfer += oprot->writeFieldBegin("enf", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->enf.write(oprot);
+ xfer += oprot->writeFieldEnd();
} else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 3);
xfer += this->ace.write(oprot);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 4);
xfer += this->ase.write(oprot);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 5);
xfer += this->ae.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -11389,11 +11038,11 @@ uint32_t Airavata_getExperimentStatistics_result::write(::apache::thrift::protoc
}
-Airavata_getExperimentStatistics_presult::~Airavata_getExperimentStatistics_presult() throw() {
+Airavata_getExperiment_presult::~Airavata_getExperiment_presult() throw() {
}
-uint32_t Airavata_getExperimentStatistics_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getExperiment_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11432,13 +11081,21 @@ uint32_t Airavata_getExperimentStatistics_presult::read(::apache::thrift::protoc
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->enf.read(iprot);
+ this->__isset.enf = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ace.read(iprot);
this->__isset.ace = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ase.read(iprot);
this->__isset.ase = true;
@@ -11446,7 +11103,7 @@ uint32_t Airavata_getExperimentStatistics_presult::read(::apache::thrift::protoc
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->ae.read(iprot);
this->__isset.ae = true;
@@ -11467,11 +11124,11 @@ uint32_t Airavata_getExperimentStatistics_presult::read(::apache::thrift::protoc
}
-Airavata_getExperimentsInProject_args::~Airavata_getExperimentsInProject_args() throw() {
+Airavata_getDetailedExperimentTree_args::~Airavata_getDetailedExperimentTree_args() throw() {
}
-uint32_t Airavata_getExperimentsInProject_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getDetailedExperimentTree_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11484,9 +11141,7 @@ uint32_t Airavata_getExperimentsInProject_args::read(::apache::thrift::protocol:
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_projectId = false;
- bool isset_limit = false;
- bool isset_offset = false;
+ bool isset_airavataExperimentId = false;
while (true)
{
@@ -11506,24 +11161,8 @@ uint32_t Airavata_getExperimentsInProject_args::read(::apache::thrift::protocol:
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->projectId);
- isset_projectId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->limit);
- isset_limit = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->offset);
- isset_offset = true;
+ xfer += iprot->readString(this->airavataExperimentId);
+ isset_airavataExperimentId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -11539,34 +11178,22 @@ uint32_t Airavata_getExperimentsInProject_args::read(::apache::thrift::protocol:
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_projectId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_limit)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_offset)
+ if (!isset_airavataExperimentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getExperimentsInProject_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getDetailedExperimentTree_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getExperimentsInProject_args");
+ xfer += oprot->writeStructBegin("Airavata_getDetailedExperimentTree_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->projectId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32(this->limit);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32(this->offset);
+ xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->airavataExperimentId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -11575,29 +11202,21 @@ uint32_t Airavata_getExperimentsInProject_args::write(::apache::thrift::protocol
}
-Airavata_getExperimentsInProject_pargs::~Airavata_getExperimentsInProject_pargs() throw() {
+Airavata_getDetailedExperimentTree_pargs::~Airavata_getDetailedExperimentTree_pargs() throw() {
}
-uint32_t Airavata_getExperimentsInProject_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getDetailedExperimentTree_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getExperimentsInProject_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getDetailedExperimentTree_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("projectId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->projectId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32((*(this->limit)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32((*(this->offset)));
+ xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->airavataExperimentId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -11606,11 +11225,11 @@ uint32_t Airavata_getExperimentsInProject_pargs::write(::apache::thrift::protoco
}
-Airavata_getExperimentsInProject_result::~Airavata_getExperimentsInProject_result() throw() {
+Airavata_getDetailedExperimentTree_result::~Airavata_getDetailedExperimentTree_result() throw() {
}
-uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getDetailedExperimentTree_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -11632,20 +11251,8 @@ uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protoco
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size173;
- ::apache::thrift::protocol::TType _etype176;
- xfer += iprot->readListBegin(_etype176, _size173);
- this->success.resize(_size173);
- uint32_t _i177;
- for (_i177 = 0; _i177 < _size173; ++_i177)
- {
- xfer += this->success[_i177].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -11661,24 +11268,24 @@ uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protoco
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
+ xfer += this->enf.read(iprot);
+ this->__isset.enf = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->pnfe.read(iprot);
- this->__isset.pnfe = true;
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -11703,40 +11310,32 @@ uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protoco
return xfer;
}
-uin
<TRUNCATED>
[21/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 3398826..690b75b 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
@@ -508,66 +508,32 @@ interface AiravataIf {
*/
public function getUserProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
/**
- *
- * Search User Projects by Project Name
- * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique 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.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $gatewayId
- * @param string $userName
- * @param string $projectName
- * @param int $limit
- * @param int $offset
- * @return \Airavata\Model\Workspace\Project[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
- /**
- *
- * Search User Projects by Project Description
- * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param description
- * The description to be matched.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+ * *
+ * * Search User Projects
+ * * Search and get all Projects for user by project description or/and project name with pagination.
+ * * Results will be ordered based on creation time DESC.
+ * *
+ * * @param gatewayId
+ * * The unique identifier of the gateway making the request.
+ * *
+ * * @param userName
+ * * The identifier of the user.
+ * *
+ * * @param filters
+ * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ * *
+ * * @param limit
+ * * The amount results to be fetched.
+ * *
+ * * @param offset
+ * * The starting point of the results to be fetched.
+ * *
+ * *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
- * @param string $description
+ * @param array $filters
* @param int $limit
* @param int $offset
* @return \Airavata\Model\Workspace\Project[]
@@ -576,7 +542,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset);
+ public function searchProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset);
/**
* Search Experiments.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
@@ -5074,107 +5040,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getUserProjects failed: unknown result");
}
- public function searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
+ public function searchProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $this->send_searchProjectsByProjectName($authzToken, $gatewayId, $userName, $projectName, $limit, $offset);
- return $this->recv_searchProjectsByProjectName();
+ $this->send_searchProjects($authzToken, $gatewayId, $userName, $filters, $limit, $offset);
+ return $this->recv_searchProjects();
}
- public function send_searchProjectsByProjectName(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $projectName, $limit, $offset)
+ public function send_searchProjects(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
{
- $args = new \Airavata\API\Airavata_searchProjectsByProjectName_args();
+ $args = new \Airavata\API\Airavata_searchProjects_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_, 'searchProjectsByProjectName', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('searchProjectsByProjectName', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_searchProjectsByProjectName()
- {
- $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_searchProjectsByProjectName_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_searchProjectsByProjectName_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("searchProjectsByProjectName failed: unknown result");
- }
-
- public function searchProjectsByProjectDesc(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $description, $limit, $offset)
- {
- $this->send_searchProjectsByProjectDesc($authzToken, $gatewayId, $userName, $description, $limit, $offset);
- return $this->recv_searchProjectsByProjectDesc();
- }
-
- 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->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_, 'searchProjectsByProjectDesc', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'searchProjects', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('searchProjectsByProjectDesc', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('searchProjects', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_searchProjectsByProjectDesc()
+ public function recv_searchProjects()
{
$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_searchProjectsByProjectDesc_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_searchProjects_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -5188,7 +5086,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_searchProjectsByProjectDesc_result();
+ $result = new \Airavata\API\Airavata_searchProjects_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -5207,7 +5105,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("searchProjectsByProjectDesc failed: unknown result");
+ throw new \Exception("searchProjects failed: unknown result");
}
public function searchExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, array $filters, $limit, $offset)
@@ -20237,7 +20135,7 @@ class Airavata_getUserProjects_result {
}
-class Airavata_searchProjectsByProjectName_args {
+class Airavata_searchProjects_args {
static $_TSPEC;
/**
@@ -20253,9 +20151,9 @@ class Airavata_searchProjectsByProjectName_args {
*/
public $userName = null;
/**
- * @var string
+ * @var array
*/
- public $projectName = null;
+ public $filters = null;
/**
* @var int
*/
@@ -20282,8 +20180,16 @@ class Airavata_searchProjectsByProjectName_args {
'type' => TType::STRING,
),
4 => array(
- 'var' => 'projectName',
- 'type' => TType::STRING,
+ 'var' => 'filters',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
),
5 => array(
'var' => 'limit',
@@ -20305,8 +20211,8 @@ class Airavata_searchProjectsByProjectName_args {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['projectName'])) {
- $this->projectName = $vals['projectName'];
+ if (isset($vals['filters'])) {
+ $this->filters = $vals['filters'];
}
if (isset($vals['limit'])) {
$this->limit = $vals['limit'];
@@ -20318,7 +20224,7 @@ class Airavata_searchProjectsByProjectName_args {
}
public function getName() {
- return 'Airavata_searchProjectsByProjectName_args';
+ return 'Airavata_searchProjects_args';
}
public function read($input)
@@ -20359,8 +20265,21 @@ class Airavata_searchProjectsByProjectName_args {
}
break;
case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectName);
+ if ($ftype == TType::MAP) {
+ $this->filters = array();
+ $_size46 = 0;
+ $_ktype47 = 0;
+ $_vtype48 = 0;
+ $xfer += $input->readMapBegin($_ktype47, $_vtype48, $_size46);
+ for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
+ {
+ $key51 = 0;
+ $val52 = '';
+ $xfer += $input->readI32($key51);
+ $xfer += $input->readString($val52);
+ $this->filters[$key51] = $val52;
+ }
+ $xfer += $input->readMapEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -20391,7 +20310,7 @@ class Airavata_searchProjectsByProjectName_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectName_args');
+ $xfer += $output->writeStructBegin('Airavata_searchProjects_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -20410,407 +20329,22 @@ class Airavata_searchProjectsByProjectName_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, 5);
- $xfer += $output->writeI32($this->limit);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
- $xfer += $output->writeI32($this->offset);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_searchProjectsByProjectName_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchProjectsByProjectName_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
- {
- $elem51 = null;
- $elem51 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem51->read($input);
- $this->success []= $elem51;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectName_result');
- if ($this->success !== null) {
- if (!is_array($this->success)) {
+ if ($this->filters !== null) {
+ if (!is_array($this->filters)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ $xfer += $output->writeFieldBegin('filters', TType::MAP, 4);
{
- $output->writeListBegin(TType::STRUCT, count($this->success));
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
{
- foreach ($this->success as $iter52)
+ foreach ($this->filters as $kiter53 => $viter54)
{
- $xfer += $iter52->write($output);
+ $xfer += $output->writeI32($kiter53);
+ $xfer += $output->writeString($viter54);
}
}
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $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;
- }
-
-}
-
-class Airavata_searchProjectsByProjectDesc_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- 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,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 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['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_searchProjectsByProjectDesc_args';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $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);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $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);
+ $output->writeMapEnd();
}
- $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, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->description !== null) {
- $xfer += $output->writeFieldBegin('description', TType::STRING, 4);
- $xfer += $output->writeString($this->description);
$xfer += $output->writeFieldEnd();
}
if ($this->limit !== null) {
@@ -20830,7 +20364,7 @@ class Airavata_searchProjectsByProjectDesc_args {
}
-class Airavata_searchProjectsByProjectDesc_result {
+class Airavata_searchProjects_result {
static $_TSPEC;
/**
@@ -20908,7 +20442,7 @@ class Airavata_searchProjectsByProjectDesc_result {
}
public function getName() {
- return 'Airavata_searchProjectsByProjectDesc_result';
+ return 'Airavata_searchProjects_result';
}
public function read($input)
@@ -20929,15 +20463,15 @@ class Airavata_searchProjectsByProjectDesc_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size53 = 0;
- $_etype56 = 0;
- $xfer += $input->readListBegin($_etype56, $_size53);
- for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
+ $_size55 = 0;
+ $_etype58 = 0;
+ $xfer += $input->readListBegin($_etype58, $_size55);
+ for ($_i59 = 0; $_i59 < $_size55; ++$_i59)
{
- $elem58 = null;
- $elem58 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem58->read($input);
- $this->success []= $elem58;
+ $elem60 = null;
+ $elem60 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem60->read($input);
+ $this->success []= $elem60;
}
$xfer += $input->readListEnd();
} else {
@@ -20988,7 +20522,7 @@ class Airavata_searchProjectsByProjectDesc_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjectsByProjectDesc_result');
+ $xfer += $output->writeStructBegin('Airavata_searchProjects_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -20997,9 +20531,9 @@ class Airavata_searchProjectsByProjectDesc_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter59)
+ foreach ($this->success as $iter61)
{
- $xfer += $iter59->write($output);
+ $xfer += $iter61->write($output);
}
}
$output->writeListEnd();
@@ -21165,17 +20699,17 @@ class Airavata_searchExperiments_args {
case 4:
if ($ftype == TType::MAP) {
$this->filters = array();
- $_size60 = 0;
- $_ktype61 = 0;
- $_vtype62 = 0;
- $xfer += $input->readMapBegin($_ktype61, $_vtype62, $_size60);
- for ($_i64 = 0; $_i64 < $_size60; ++$_i64)
+ $_size62 = 0;
+ $_ktype63 = 0;
+ $_vtype64 = 0;
+ $xfer += $input->readMapBegin($_ktype63, $_vtype64, $_size62);
+ for ($_i66 = 0; $_i66 < $_size62; ++$_i66)
{
- $key65 = 0;
- $val66 = '';
- $xfer += $input->readI32($key65);
- $xfer += $input->readString($val66);
- $this->filters[$key65] = $val66;
+ $key67 = 0;
+ $val68 = '';
+ $xfer += $input->readI32($key67);
+ $xfer += $input->readString($val68);
+ $this->filters[$key67] = $val68;
}
$xfer += $input->readMapEnd();
} else {
@@ -21235,10 +20769,10 @@ class Airavata_searchExperiments_args {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
{
- foreach ($this->filters as $kiter67 => $viter68)
+ foreach ($this->filters as $kiter69 => $viter70)
{
- $xfer += $output->writeI32($kiter67);
- $xfer += $output->writeString($viter68);
+ $xfer += $output->writeI32($kiter69);
+ $xfer += $output->writeString($viter70);
}
}
$output->writeMapEnd();
@@ -21361,15 +20895,15 @@ class Airavata_searchExperiments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size69 = 0;
- $_etype72 = 0;
- $xfer += $input->readListBegin($_etype72, $_size69);
- for ($_i73 = 0; $_i73 < $_size69; ++$_i73)
+ $_size71 = 0;
+ $_etype74 = 0;
+ $xfer += $input->readListBegin($_etype74, $_size71);
+ for ($_i75 = 0; $_i75 < $_size71; ++$_i75)
{
- $elem74 = null;
- $elem74 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem74->read($input);
- $this->success []= $elem74;
+ $elem76 = null;
+ $elem76 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem76->read($input);
+ $this->success []= $elem76;
}
$xfer += $input->readListEnd();
} else {
@@ -21429,9 +20963,9 @@ class Airavata_searchExperiments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter75)
+ foreach ($this->success as $iter77)
{
- $xfer += $iter75->write($output);
+ $xfer += $iter77->write($output);
}
}
$output->writeListEnd();
@@ -22054,15 +21588,15 @@ class Airavata_getExperimentsInProject_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size76 = 0;
- $_etype79 = 0;
- $xfer += $input->readListBegin($_etype79, $_size76);
- for ($_i80 = 0; $_i80 < $_size76; ++$_i80)
+ $_size78 = 0;
+ $_etype81 = 0;
+ $xfer += $input->readListBegin($_etype81, $_size78);
+ for ($_i82 = 0; $_i82 < $_size78; ++$_i82)
{
- $elem81 = null;
- $elem81 = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $elem81->read($input);
- $this->success []= $elem81;
+ $elem83 = null;
+ $elem83 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem83->read($input);
+ $this->success []= $elem83;
}
$xfer += $input->readListEnd();
} else {
@@ -22130,9 +21664,9 @@ class Airavata_getExperimentsInProject_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter82)
+ foreach ($this->success as $iter84)
{
- $xfer += $iter82->write($output);
+ $xfer += $iter84->write($output);
}
}
$output->writeListEnd();
@@ -22442,15 +21976,15 @@ class Airavata_getUserExperiments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size83 = 0;
- $_etype86 = 0;
- $xfer += $input->readListBegin($_etype86, $_size83);
- for ($_i87 = 0; $_i87 < $_size83; ++$_i87)
+ $_size85 = 0;
+ $_etype88 = 0;
+ $xfer += $input->readListBegin($_etype88, $_size85);
+ for ($_i89 = 0; $_i89 < $_size85; ++$_i89)
{
- $elem88 = null;
- $elem88 = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $elem88->read($input);
- $this->success []= $elem88;
+ $elem90 = null;
+ $elem90 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem90->read($input);
+ $this->success []= $elem90;
}
$xfer += $input->readListEnd();
} else {
@@ -22510,9 +22044,9 @@ class Airavata_getUserExperiments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter89)
+ foreach ($this->success as $iter91)
{
- $xfer += $iter89->write($output);
+ $xfer += $iter91->write($output);
}
}
$output->writeListEnd();
@@ -25598,15 +25132,15 @@ class Airavata_getExperimentOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size90 = 0;
- $_etype93 = 0;
- $xfer += $input->readListBegin($_etype93, $_size90);
- for ($_i94 = 0; $_i94 < $_size90; ++$_i94)
+ $_size92 = 0;
+ $_etype95 = 0;
+ $xfer += $input->readListBegin($_etype95, $_size92);
+ for ($_i96 = 0; $_i96 < $_size92; ++$_i96)
{
- $elem95 = null;
- $elem95 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem95->read($input);
- $this->success []= $elem95;
+ $elem97 = null;
+ $elem97 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem97->read($input);
+ $this->success []= $elem97;
}
$xfer += $input->readListEnd();
} else {
@@ -25674,9 +25208,9 @@ class Airavata_getExperimentOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter96)
+ foreach ($this->success as $iter98)
{
- $xfer += $iter96->write($output);
+ $xfer += $iter98->write($output);
}
}
$output->writeListEnd();
@@ -25929,15 +25463,15 @@ class Airavata_getIntermediateOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size97 = 0;
- $_etype100 = 0;
- $xfer += $input->readListBegin($_etype100, $_size97);
- for ($_i101 = 0; $_i101 < $_size97; ++$_i101)
+ $_size99 = 0;
+ $_etype102 = 0;
+ $xfer += $input->readListBegin($_etype102, $_size99);
+ for ($_i103 = 0; $_i103 < $_size99; ++$_i103)
{
- $elem102 = null;
- $elem102 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem102->read($input);
- $this->success []= $elem102;
+ $elem104 = null;
+ $elem104 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem104->read($input);
+ $this->success []= $elem104;
}
$xfer += $input->readListEnd();
} else {
@@ -26005,9 +25539,9 @@ class Airavata_getIntermediateOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter103)
+ foreach ($this->success as $iter105)
{
- $xfer += $iter103->write($output);
+ $xfer += $iter105->write($output);
}
}
$output->writeListEnd();
@@ -26264,18 +25798,18 @@ class Airavata_getJobStatuses_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size104 = 0;
- $_ktype105 = 0;
- $_vtype106 = 0;
- $xfer += $input->readMapBegin($_ktype105, $_vtype106, $_size104);
- for ($_i108 = 0; $_i108 < $_size104; ++$_i108)
+ $_size106 = 0;
+ $_ktype107 = 0;
+ $_vtype108 = 0;
+ $xfer += $input->readMapBegin($_ktype107, $_vtype108, $_size106);
+ for ($_i110 = 0; $_i110 < $_size106; ++$_i110)
{
- $key109 = '';
- $val110 = new \Airavata\Model\Status\JobStatus();
- $xfer += $input->readString($key109);
- $val110 = new \Airavata\Model\Status\JobStatus();
- $xfer += $val110->read($input);
- $this->success[$key109] = $val110;
+ $key111 = '';
+ $val112 = new \Airavata\Model\Status\JobStatus();
+ $xfer += $input->readString($key111);
+ $val112 = new \Airavata\Model\Status\JobStatus();
+ $xfer += $val112->read($input);
+ $this->success[$key111] = $val112;
}
$xfer += $input->readMapEnd();
} else {
@@ -26343,10 +25877,10 @@ class Airavata_getJobStatuses_result {
{
$output->writeMapBegin(TType::STRING, TType::STRUCT, count($this->success));
{
- foreach ($this->success as $kiter111 => $viter112)
+ foreach ($this->success as $kiter113 => $viter114)
{
- $xfer += $output->writeString($kiter111);
- $xfer += $viter112->write($output);
+ $xfer += $output->writeString($kiter113);
+ $xfer += $viter114->write($output);
}
}
$output->writeMapEnd();
@@ -26599,15 +26133,15 @@ class Airavata_getJobDetails_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size113 = 0;
- $_etype116 = 0;
- $xfer += $input->readListBegin($_etype116, $_size113);
- for ($_i117 = 0; $_i117 < $_size113; ++$_i117)
+ $_size115 = 0;
+ $_etype118 = 0;
+ $xfer += $input->readListBegin($_etype118, $_size115);
+ for ($_i119 = 0; $_i119 < $_size115; ++$_i119)
{
- $elem118 = null;
- $elem118 = new \Airavata\Model\Job\JobModel();
- $xfer += $elem118->read($input);
- $this->success []= $elem118;
+ $elem120 = null;
+ $elem120 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem120->read($input);
+ $this->success []= $elem120;
}
$xfer += $input->readListEnd();
} else {
@@ -26675,9 +26209,9 @@ class Airavata_getJobDetails_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter119)
+ foreach ($this->success as $iter121)
{
- $xfer += $iter119->write($output);
+ $xfer += $iter121->write($output);
}
}
$output->writeListEnd();
@@ -28442,15 +27976,15 @@ class Airavata_getAllAppModules_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size120 = 0;
- $_etype123 = 0;
- $xfer += $input->readListBegin($_etype123, $_size120);
- for ($_i124 = 0; $_i124 < $_size120; ++$_i124)
+ $_size122 = 0;
+ $_etype125 = 0;
+ $xfer += $input->readListBegin($_etype125, $_size122);
+ for ($_i126 = 0; $_i126 < $_size122; ++$_i126)
{
- $elem125 = null;
- $elem125 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
- $xfer += $elem125->read($input);
- $this->success []= $elem125;
+ $elem127 = null;
+ $elem127 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
+ $xfer += $elem127->read($input);
+ $this->success []= $elem127;
}
$xfer += $input->readListEnd();
} else {
@@ -28510,9 +28044,9 @@ class Airavata_getAllAppModules_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter126)
+ foreach ($this->success as $iter128)
{
- $xfer += $iter126->write($output);
+ $xfer += $iter128->write($output);
}
}
$output->writeListEnd();
@@ -30199,15 +29733,15 @@ class Airavata_getAllApplicationDeployments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size127 = 0;
- $_etype130 = 0;
- $xfer += $input->readListBegin($_etype130, $_size127);
- for ($_i131 = 0; $_i131 < $_size127; ++$_i131)
+ $_size129 = 0;
+ $_etype132 = 0;
+ $xfer += $input->readListBegin($_etype132, $_size129);
+ for ($_i133 = 0; $_i133 < $_size129; ++$_i133)
{
- $elem132 = null;
- $elem132 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
- $xfer += $elem132->read($input);
- $this->success []= $elem132;
+ $elem134 = null;
+ $elem134 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
+ $xfer += $elem134->read($input);
+ $this->success []= $elem134;
}
$xfer += $input->readListEnd();
} else {
@@ -30267,9 +29801,9 @@ class Airavata_getAllApplicationDeployments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter133)
+ foreach ($this->success as $iter135)
{
- $xfer += $iter133->write($output);
+ $xfer += $iter135->write($output);
}
}
$output->writeListEnd();
@@ -30504,14 +30038,14 @@ class Airavata_getAppModuleDeployedResources_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size134 = 0;
- $_etype137 = 0;
- $xfer += $input->readListBegin($_etype137, $_size134);
- for ($_i138 = 0; $_i138 < $_size134; ++$_i138)
+ $_size136 = 0;
+ $_etype139 = 0;
+ $xfer += $input->readListBegin($_etype139, $_size136);
+ for ($_i140 = 0; $_i140 < $_size136; ++$_i140)
{
- $elem139 = null;
- $xfer += $input->readString($elem139);
- $this->success []= $elem139;
+ $elem141 = null;
+ $xfer += $input->readString($elem141);
+ $this->success []= $elem141;
}
$xfer += $input->readListEnd();
} else {
@@ -30571,9 +30105,9 @@ class Airavata_getAppModuleDeployedResources_result {
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter140)
+ foreach ($this->success as $iter142)
{
- $xfer += $output->writeString($iter140);
+ $xfer += $output->writeString($iter142);
}
}
$output->writeListEnd();
@@ -32309,17 +31843,17 @@ class Airavata_getAllApplicationInterfaceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size141 = 0;
- $_ktype142 = 0;
- $_vtype143 = 0;
- $xfer += $input->readMapBegin($_ktype142, $_vtype143, $_size141);
- for ($_i145 = 0; $_i145 < $_size141; ++$_i145)
+ $_size143 = 0;
+ $_ktype144 = 0;
+ $_vtype145 = 0;
+ $xfer += $input->readMapBegin($_ktype144, $_vtype145, $_size143);
+ for ($_i147 = 0; $_i147 < $_size143; ++$_i147)
{
- $key146 = '';
- $val147 = '';
- $xfer += $input->readString($key146);
- $xfer += $input->readString($val147);
- $this->success[$key146] = $val147;
+ $key148 = '';
+ $val149 = '';
+ $xfer += $input->readString($key148);
+ $xfer += $input->readString($val149);
+ $this->success[$key148] = $val149;
}
$xfer += $input->readMapEnd();
} else {
@@ -32379,10 +31913,10 @@ class Airavata_getAllApplicationInterfaceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter148 => $viter149)
+ foreach ($this->success as $kiter150 => $viter151)
{
- $xfer += $output->writeString($kiter148);
- $xfer += $output->writeString($viter149);
+ $xfer += $output->writeString($kiter150);
+ $xfer += $output->writeString($viter151);
}
}
$output->writeMapEnd();
@@ -32618,15 +32152,15 @@ class Airavata_getAllApplicationInterfaces_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size150 = 0;
- $_etype153 = 0;
- $xfer += $input->readListBegin($_etype153, $_size150);
- for ($_i154 = 0; $_i154 < $_size150; ++$_i154)
+ $_size152 = 0;
+ $_etype155 = 0;
+ $xfer += $input->readListBegin($_etype155, $_size152);
+ for ($_i156 = 0; $_i156 < $_size152; ++$_i156)
{
- $elem155 = null;
- $elem155 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
- $xfer += $elem155->read($input);
- $this->success []= $elem155;
+ $elem157 = null;
+ $elem157 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
+ $xfer += $elem157->read($input);
+ $this->success []= $elem157;
}
$xfer += $input->readListEnd();
} else {
@@ -32686,9 +32220,9 @@ class Airavata_getAllApplicationInterfaces_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter156)
+ foreach ($this->success as $iter158)
{
- $xfer += $iter156->write($output);
+ $xfer += $iter158->write($output);
}
}
$output->writeListEnd();
@@ -32924,15 +32458,15 @@ class Airavata_getApplicationInputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size157 = 0;
- $_etype160 = 0;
- $xfer += $input->readListBegin($_etype160, $_size157);
- for ($_i161 = 0; $_i161 < $_size157; ++$_i161)
+ $_size159 = 0;
+ $_etype162 = 0;
+ $xfer += $input->readListBegin($_etype162, $_size159);
+ for ($_i163 = 0; $_i163 < $_size159; ++$_i163)
{
- $elem162 = null;
- $elem162 = new \Airavata\Model\Application\Io\InputDataObjectType();
- $xfer += $elem162->read($input);
- $this->success []= $elem162;
+ $elem164 = null;
+ $elem164 = new \Airavata\Model\Application\Io\InputDataObjectType();
+ $xfer += $elem164->read($input);
+ $this->success []= $elem164;
}
$xfer += $input->readListEnd();
} else {
@@ -32992,9 +32526,9 @@ class Airavata_getApplicationInputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter163)
+ foreach ($this->success as $iter165)
{
- $xfer += $iter163->write($output);
+ $xfer += $iter165->write($output);
}
}
$output->writeListEnd();
@@ -33230,15 +32764,15 @@ class Airavata_getApplicationOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size164 = 0;
- $_etype167 = 0;
- $xfer += $input->readListBegin($_etype167, $_size164);
- for ($_i168 = 0; $_i168 < $_size164; ++$_i168)
+ $_size166 = 0;
+ $_etype169 = 0;
+ $xfer += $input->readListBegin($_etype169, $_size166);
+ for ($_i170 = 0; $_i170 < $_size166; ++$_i170)
{
- $elem169 = null;
- $elem169 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem169->read($input);
- $this->success []= $elem169;
+ $elem171 = null;
+ $elem171 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem171->read($input);
+ $this->success []= $elem171;
}
$xfer += $input->readListEnd();
} else {
@@ -33298,9 +32832,9 @@ class Airavata_getApplicationOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter170)
+ foreach ($this->success as $iter172)
{
- $xfer += $iter170->write($output);
+ $xfer += $iter172->write($output);
}
}
$output->writeListEnd();
@@ -33539,17 +33073,17 @@ class Airavata_getAvailableAppInterfaceComputeResources_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size171 = 0;
- $_ktype172 = 0;
- $_vtype173 = 0;
- $xfer += $input->readMapBegin($_ktype172, $_vtype173, $_size171);
- for ($_i175 = 0; $_i175 < $_size171; ++$_i175)
+ $_size173 = 0;
+ $_ktype174 = 0;
+ $_vtype175 = 0;
+ $xfer += $input->readMapBegin($_ktype174, $_vtype175, $_size173);
+ for ($_i177 = 0; $_i177 < $_size173; ++$_i177)
{
- $key176 = '';
- $val177 = '';
- $xfer += $input->readString($key176);
- $xfer += $input->readString($val177);
- $this->success[$key176] = $val177;
+ $key178 = '';
+ $val179 = '';
+ $xfer += $input->readString($key178);
+ $xfer += $input->readString($val179);
+ $this->success[$key178] = $val179;
}
$xfer += $input->readMapEnd();
} else {
@@ -33609,10 +33143,10 @@ class Airavata_getAvailableAppInterfaceComputeResources_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter178 => $viter179)
+ foreach ($this->success as $kiter180 => $viter181)
{
- $xfer += $output->writeString($kiter178);
- $xfer += $output->writeString($viter179);
+ $xfer += $output->writeString($kiter180);
+ $xfer += $output->writeString($viter181);
}
}
$output->writeMapEnd();
@@ -34394,17 +33928,17 @@ class Airavata_getAllComputeResourceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size180 = 0;
- $_ktype181 = 0;
- $_vtype182 = 0;
- $xfer += $input->readMapBegin($_ktype181, $_vtype182, $_size180);
- for ($_i184 = 0; $_i184 < $_size180; ++$_i184)
+ $_size182 = 0;
+ $_ktype183 = 0;
+ $_vtype184 = 0;
+ $xfer += $input->readMapBegin($_ktype183, $_vtype184, $_size182);
+ for ($_i186 = 0; $_i186 < $_size182; ++$_i186)
{
- $key185 = '';
- $val186 = '';
- $xfer += $input->readString($key185);
- $xfer += $input->readString($val186);
- $this->success[$key185] = $val186;
+ $key187 = '';
+ $val188 = '';
+ $xfer += $input->readString($key187);
+ $xfer += $input->readString($val188);
+ $this->success[$key187] = $val188;
}
$xfer += $input->readMapEnd();
} else {
@@ -34464,10 +33998,10 @@ class Airavata_getAllComputeResourceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter187 => $viter188)
+ foreach ($this->success as $kiter189 => $viter190)
{
- $xfer += $output->writeString($kiter187);
- $xfer += $output->writeString($viter188);
+ $xfer += $output->writeString($kiter189);
+ $xfer += $output->writeString($viter190);
}
}
$output->writeMapEnd();
@@ -35833,17 +35367,17 @@ class Airavata_getAllStorageResourceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size189 = 0;
- $_ktype190 = 0;
- $_vtype191 = 0;
- $xfer += $input->readMapBegin($_ktype190, $_vtype191, $_size189);
- for ($_i193 = 0; $_i193 < $_size189; ++$_i193)
+ $_size191 = 0;
+ $_ktype192 = 0;
+ $_vtype193 = 0;
+ $xfer += $input->readMapBegin($_ktype192, $_vtype193, $_size191);
+ for ($_i195 = 0; $_i195 < $_size191; ++$_i195)
{
- $key194 = '';
- $val195 = '';
- $xfer += $input->readString($key194);
- $xfer += $input->readString($val195);
- $this->success[$key194] = $val195;
+ $key196 = '';
+ $val197 = '';
+ $xfer += $input->readString($key196);
+ $xfer += $input->readString($val197);
+ $this->success[$key196] = $val197;
}
$xfer += $input->readMapEnd();
} else {
@@ -35903,10 +35437,10 @@ class Airavata_getAllStorageResourceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter196 => $viter197)
+ foreach ($this->success as $kiter198 => $viter199)
{
- $xfer += $output->writeString($kiter196);
- $xfer += $output->writeString($viter197);
+ $xfer += $output->writeString($kiter198);
+ $xfer += $output->writeString($viter199);
}
}
$output->writeMapEnd();
@@ -44965,17 +44499,17 @@ class Airavata_changeJobSubmissionPriorities_args {
case 2:
if ($ftype == TType::MAP) {
$this->jobSubmissionPriorityMap = array();
- $_size198 = 0;
- $_ktype199 = 0;
- $_vtype200 = 0;
- $xfer += $input->readMapBegin($_ktype199, $_vtype200, $_size198);
- for ($_i202 = 0; $_i202 < $_size198; ++$_i202)
+ $_size200 = 0;
+ $_ktype201 = 0;
+ $_vtype202 = 0;
+ $xfer += $input->readMapBegin($_ktype201, $_vtype202, $_size200);
+ for ($_i204 = 0; $_i204 < $_size200; ++$_i204)
{
- $key203 = '';
- $val204 = 0;
- $xfer += $input->readString($key203);
- $xfer += $input->readI32($val204);
- $this->jobSubmissionPriorityMap[$key203] = $val204;
+ $key205 = '';
+ $val206 = 0;
+ $xfer += $input->readString($key205);
+ $xfer += $input->readI32($val206);
+ $this->jobSubmissionPriorityMap[$key205] = $val206;
}
$xfer += $input->readMapEnd();
} else {
@@ -45011,10 +44545,10 @@ class Airavata_changeJobSubmissionPriorities_args {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->jobSubmissionPriorityMap));
{
- foreach ($this->jobSubmissionPriorityMap as $kiter205 => $viter206)
+ foreach ($this->jobSubmissionPriorityMap as $kiter207 => $viter208)
{
- $xfer += $output->writeString($kiter205);
- $xfer += $output->writeI32($viter206);
+ $xfer += $output->writeString($kiter207);
+ $xfer += $output->writeI32($viter208);
}
}
$output->writeMapEnd();
@@ -45277,17 +44811,17 @@ class Airavata_changeDataMovementPriorities_args {
case 2:
if ($ftype == TType::MAP) {
$this->dataMovementPriorityMap = array();
- $_size207 = 0;
- $_ktype208 = 0;
- $_vtype209 = 0;
- $xfer += $input->readMapBegin($_ktype208, $_vtype209, $_size207);
- for ($_i211 = 0; $_i211 < $_size207; ++$_i211)
+ $_size209 = 0;
+ $_ktype210 = 0;
+ $_vtype211 = 0;
+ $xfer += $input->readMapBegin($_ktype210, $_vtype211, $_size209);
+ for ($_i213 = 0; $_i213 < $_size209; ++$_i213)
{
- $key212 = '';
- $val213 = 0;
- $xfer += $input->readString($key212);
- $xfer += $input->readI32($val213);
- $this->dataMovementPriorityMap[$key212] = $val213;
+ $key214 = '';
+ $val215 = 0;
+ $xfer += $input->readString($key214);
+ $xfer += $input->readI32($val215);
+ $this->dataMovementPriorityMap[$key214] = $val215;
}
$xfer += $input->readMapEnd();
} else {
@@ -45323,10 +44857,10 @@ class Airavata_changeDataMovementPriorities_args {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->dataMovementPriorityMap));
{
- foreach ($this->dataMovementPriorityMap as $kiter214 => $viter215)
+ foreach ($this->dataMovementPriorityMap as $kiter216 => $viter217)
{
- $xfer += $output->writeString($kiter214);
- $xfer += $output->writeI32($viter215);
+ $xfer += $output->writeString($kiter216);
+ $xfer += $output->writeI32($viter217);
}
}
$output->writeMapEnd();
@@ -50213,15 +49747,15 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size216 = 0;
- $_etype219 = 0;
- $xfer += $input->readListBegin($_etype219, $_size216);
- for ($_i220 = 0; $_i220 < $_size216; ++$_i220)
+ $_size218 = 0;
+ $_etype221 = 0;
+ $xfer += $input->readListBegin($_etype221, $_size218);
+ for ($_i222 = 0; $_i222 < $_size218; ++$_i222)
{
- $elem221 = null;
- $elem221 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
- $xfer += $elem221->read($input);
- $this->success []= $elem221;
+ $elem223 = null;
+ $elem223 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
+ $xfer += $elem223->read($input);
+ $this->success []= $elem223;
}
$xfer += $input->readListEnd();
} else {
@@ -50281,9 +49815,9 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter222)
+ foreach ($this->success as $iter224)
{
- $xfer += $iter222->write($output);
+ $xfer += $iter224->write($output);
}
}
$output->writeListEnd();
@@ -50519,15 +50053,15 @@ class Airavata_getAllGatewayStoragePreferences_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size223 = 0;
- $_etype226 = 0;
- $xfer += $input->readListBegin($_etype226, $_size223);
- for ($_i227 = 0; $_i227 < $_size223; ++$_i227)
+ $_size225 = 0;
+ $_etype228 = 0;
+ $xfer += $input->readListBegin($_etype228, $_size225);
+ for ($_i229 = 0; $_i229 < $_size225; ++$_i229)
{
- $elem228 = null;
- $elem228 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
- $xfer += $elem228->read($input);
- $this->success []= $elem228;
+ $elem230 = null;
+ $elem230 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+ $xfer += $elem230->read($input);
+ $this->success []= $elem230;
}
$xfer += $input->readListEnd();
} else {
@@ -50587,9 +50121,9 @@ class Airavata_getAllGatewayStoragePreferences_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter229)
+ foreach ($this->success as $iter231)
{
- $xfer += $iter229->write($output);
+ $xfer += $iter231->write($output);
}
}
$output->writeListEnd();
@@ -50802,15 +50336,15 @@ class Airavata_getAllGatewayResourceProfiles_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size230 = 0;
- $_etype233 = 0;
- $xfer += $input->readListBegin($_etype233, $_size230);
- for ($_i234 = 0; $_i234 < $_size230; ++$_i234)
+ $_size232 = 0;
+ $_etype235 = 0;
+ $xfer += $input->readListBegin($_etype235, $_size232);
+ for ($_i236 = 0; $_i236 < $_size232; ++$_i236)
{
- $elem235 = null;
- $elem235 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile();
- $xfer += $elem235->read($input);
- $this->success []= $elem235;
+ $elem237 = null;
+ $elem237 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile();
+ $xfer += $elem237->read($input);
+ $this->success []= $elem237;
}
$xfer += $input->readListEnd();
} else {
@@ -50870,9 +50404,9 @@ class Airavata_getAllGatewayResourceProfiles_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter236)
+ foreach ($this->success as $iter238)
{
- $xfer += $iter236->write($output);
+ $xfer += $iter238->write($output);
}
}
$output->writeListEnd();
@@ -52367,14 +51901,14 @@ class Airavata_getAllWorkflows_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size237 = 0;
- $_etype240 = 0;
- $xfer += $input->readListBegin($_etype240, $_size237);
- for ($_i241 = 0; $_i241 < $_size237; ++$_i241)
+ $_size239 = 0;
+ $_etype242 = 0;
+ $xfer += $input->readListBegin($_etype242, $_size239);
+ for ($_i243 = 0; $_i243 < $_size239; ++$_i243)
{
- $elem242 = null;
- $xfer += $input->readString($elem242);
- $this->success []= $elem242;
+ $elem244 = null;
+ $xfer += $input->readString($elem244);
+ $this->success []= $elem244;
}
$xfer += $input->readListEnd();
} else {
@@ -52434,9 +51968,9 @@ class Airavata_getAllWorkflows_result {
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter243)
+ foreach ($this->success as $iter245)
{
- $xfer += $output->writeString($iter243);
+ $xfer += $output->writeString($iter245);
}
}
$output->writeListEnd();
@@ -55487,15 +55021,15 @@ class Airavata_getChildDataProducts_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size244 = 0;
- $_etype247 = 0;
- $xfer += $input->readListBegin($_etype247, $_size244);
- for ($_i248 = 0; $_i248 < $_size244; ++$_i248)
+ $_size246 = 0;
+ $_etype249 = 0;
+ $xfer += $input->readListBegin($_etype249, $_size246);
+ for ($_i250 = 0; $_i250 < $_size246; ++$_i250)
{
- $elem249 = null;
- $elem249 = new \Airavata\Model\Data\Replica\DataProductModel();
- $xfer += $elem249->read($input);
- $this->success []= $elem249;
+ $elem251 = null;
+ $elem251 = new \Airavata\Model\Data\Replica\DataProductModel();
+ $xfer += $elem251->read($input);
+ $this->success []= $elem251;
}
$xfer += $input->readListEnd();
} else {
@@ -55555,9 +55089,9 @@ class Airavata_getChildDataProducts_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter250)
+ foreach ($this->success as $iter252)
{
- $xfer += $iter250->write($output);
+ $xfer += $iter252->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
index 20587b6..5018139 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
@@ -45,6 +45,15 @@ final class ExperimentSearchFields {
);
}
+final class ProjectSearchFields {
+ const PROJECT_NAME = 0;
+ const PROJECT_DESCRIPTION = 1;
+ static public $__names = array(
+ 0 => 'PROJECT_NAME',
+ 1 => 'PROJECT_DESCRIPTION',
+ );
+}
+
/**
* A structure holding the experiment configuration.
*
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 670de62..a0dd723 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
@@ -50,8 +50,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' Project getProject(AuthzToken authzToken, string projectId)')
print(' bool deleteProject(AuthzToken authzToken, string projectId)')
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(' searchProjects(AuthzToken authzToken, string gatewayId, string userName, filters, 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(' getExperimentsInProject(AuthzToken authzToken, string projectId, i32 limit, i32 offset)')
@@ -378,17 +377,11 @@ elif cmd == 'getUserProjects':
sys.exit(1)
pp.pprint(client.getUserProjects(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),))
-elif cmd == 'searchProjectsByProjectName':
+elif cmd == 'searchProjects':
if len(args) != 6:
- print('searchProjectsByProjectName requires 6 args')
+ print('searchProjects requires 6 args')
sys.exit(1)
- 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) != 6:
- print('searchProjectsByProjectDesc requires 6 args')
- sys.exit(1)
- pp.pprint(client.searchProjectsByProjectDesc(eval(args[0]),args[1],args[2],args[3],eval(args[4]),eval(args[5]),))
+ pp.pprint(client.searchProjects(eval(args[0]),args[1],args[2],eval(args[3]),eval(args[4]),eval(args[5]),))
elif cmd == 'searchExperiments':
if len(args) != 6:
[50/53] [abbrv] airavata git commit: adding hasOptionalFileInputs to
the Application interface
Posted by sh...@apache.org.
adding hasOptionalFileInputs to the Application interface
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0b40482a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0b40482a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0b40482a
Branch: refs/heads/master
Commit: 0b40482a915e848dabce421ef5518f31249950a1
Parents: d20f77e
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 6 14:49:04 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 6 14:49:05 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../application_interface_model_types.cpp | 22 ++++
.../application_interface_model_types.h | 12 +-
.../Model/AppCatalog/AppInterface/Types.php | 23 ++++
.../model/appcatalog/appinterface/ttypes.py | 15 ++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 109 ++++++++++++++++++-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../catalog/impl/ApplicationInterfaceImpl.java | 2 +
.../app/catalog/model/ApplicationInterface.java | 10 ++
.../catalog/resources/AppInterfaceResource.java | 11 ++
.../app/catalog/util/AppCatalogJPAUtils.java | 1 +
.../util/AppCatalogThriftConversion.java | 1 +
.../application_interface_model.thrift | 3 +-
96 files changed, 285 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 35b03fd..eb378eb 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.cpp
index 068f8f1..c69f85a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.cpp
@@ -68,6 +68,11 @@ void ApplicationInterfaceDescription::__set_archiveWorkingDirectory(const bool v
__isset.archiveWorkingDirectory = true;
}
+void ApplicationInterfaceDescription::__set_hasOptionalFileInputs(const bool val) {
+ this->hasOptionalFileInputs = val;
+__isset.hasOptionalFileInputs = true;
+}
+
uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -183,6 +188,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt
xfer += iprot->skip(ftype);
}
break;
+ case 8:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->hasOptionalFileInputs);
+ this->__isset.hasOptionalFileInputs = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -261,6 +274,11 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro
xfer += oprot->writeBool(this->archiveWorkingDirectory);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.hasOptionalFileInputs) {
+ xfer += oprot->writeFieldBegin("hasOptionalFileInputs", ::apache::thrift::protocol::T_BOOL, 8);
+ xfer += oprot->writeBool(this->hasOptionalFileInputs);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -275,6 +293,7 @@ void swap(ApplicationInterfaceDescription &a, ApplicationInterfaceDescription &b
swap(a.applicationInputs, b.applicationInputs);
swap(a.applicationOutputs, b.applicationOutputs);
swap(a.archiveWorkingDirectory, b.archiveWorkingDirectory);
+ swap(a.hasOptionalFileInputs, b.hasOptionalFileInputs);
swap(a.__isset, b.__isset);
}
@@ -286,6 +305,7 @@ ApplicationInterfaceDescription::ApplicationInterfaceDescription(const Applicati
applicationInputs = other18.applicationInputs;
applicationOutputs = other18.applicationOutputs;
archiveWorkingDirectory = other18.archiveWorkingDirectory;
+ hasOptionalFileInputs = other18.hasOptionalFileInputs;
__isset = other18.__isset;
}
ApplicationInterfaceDescription& ApplicationInterfaceDescription::operator=(const ApplicationInterfaceDescription& other19) {
@@ -296,6 +316,7 @@ ApplicationInterfaceDescription& ApplicationInterfaceDescription::operator=(cons
applicationInputs = other19.applicationInputs;
applicationOutputs = other19.applicationOutputs;
archiveWorkingDirectory = other19.archiveWorkingDirectory;
+ hasOptionalFileInputs = other19.hasOptionalFileInputs;
__isset = other19.__isset;
return *this;
}
@@ -309,6 +330,7 @@ void ApplicationInterfaceDescription::printTo(std::ostream& out) const {
out << ", " << "applicationInputs="; (__isset.applicationInputs ? (out << to_string(applicationInputs)) : (out << "<null>"));
out << ", " << "applicationOutputs="; (__isset.applicationOutputs ? (out << to_string(applicationOutputs)) : (out << "<null>"));
out << ", " << "archiveWorkingDirectory="; (__isset.archiveWorkingDirectory ? (out << to_string(archiveWorkingDirectory)) : (out << "<null>"));
+ out << ", " << "hasOptionalFileInputs="; (__isset.hasOptionalFileInputs ? (out << to_string(hasOptionalFileInputs)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h
index cec4016..96d61d7 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_interface_model_types.h
@@ -41,12 +41,13 @@ namespace apache { namespace airavata { namespace model { namespace appcatalog {
class ApplicationInterfaceDescription;
typedef struct _ApplicationInterfaceDescription__isset {
- _ApplicationInterfaceDescription__isset() : applicationDescription(false), applicationModules(false), applicationInputs(false), applicationOutputs(false), archiveWorkingDirectory(true) {}
+ _ApplicationInterfaceDescription__isset() : applicationDescription(false), applicationModules(false), applicationInputs(false), applicationOutputs(false), archiveWorkingDirectory(true), hasOptionalFileInputs(false) {}
bool applicationDescription :1;
bool applicationModules :1;
bool applicationInputs :1;
bool applicationOutputs :1;
bool archiveWorkingDirectory :1;
+ bool hasOptionalFileInputs :1;
} _ApplicationInterfaceDescription__isset;
class ApplicationInterfaceDescription {
@@ -54,7 +55,7 @@ class ApplicationInterfaceDescription {
ApplicationInterfaceDescription(const ApplicationInterfaceDescription&);
ApplicationInterfaceDescription& operator=(const ApplicationInterfaceDescription&);
- ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription(), archiveWorkingDirectory(false) {
+ ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription(), archiveWorkingDirectory(false), hasOptionalFileInputs(0) {
}
virtual ~ApplicationInterfaceDescription() throw();
@@ -65,6 +66,7 @@ class ApplicationInterfaceDescription {
std::vector< ::apache::airavata::model::application::io::InputDataObjectType> applicationInputs;
std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> applicationOutputs;
bool archiveWorkingDirectory;
+ bool hasOptionalFileInputs;
_ApplicationInterfaceDescription__isset __isset;
@@ -82,6 +84,8 @@ class ApplicationInterfaceDescription {
void __set_archiveWorkingDirectory(const bool val);
+ void __set_hasOptionalFileInputs(const bool val);
+
bool operator == (const ApplicationInterfaceDescription & rhs) const
{
if (!(applicationInterfaceId == rhs.applicationInterfaceId))
@@ -108,6 +112,10 @@ class ApplicationInterfaceDescription {
return false;
else if (__isset.archiveWorkingDirectory && !(archiveWorkingDirectory == rhs.archiveWorkingDirectory))
return false;
+ if (__isset.hasOptionalFileInputs != rhs.__isset.hasOptionalFileInputs)
+ return false;
+ else if (__isset.hasOptionalFileInputs && !(hasOptionalFileInputs == rhs.hasOptionalFileInputs))
+ return false;
return true;
}
bool operator != (const ApplicationInterfaceDescription &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
index e2143f0..2477b43 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -61,6 +61,10 @@ class ApplicationInterfaceDescription {
* @var bool
*/
public $archiveWorkingDirectory = false;
+ /**
+ * @var bool
+ */
+ public $hasOptionalFileInputs = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -107,6 +111,10 @@ class ApplicationInterfaceDescription {
'var' => 'archiveWorkingDirectory',
'type' => TType::BOOL,
),
+ 8 => array(
+ 'var' => 'hasOptionalFileInputs',
+ 'type' => TType::BOOL,
+ ),
);
}
if (is_array($vals)) {
@@ -131,6 +139,9 @@ class ApplicationInterfaceDescription {
if (isset($vals['archiveWorkingDirectory'])) {
$this->archiveWorkingDirectory = $vals['archiveWorkingDirectory'];
}
+ if (isset($vals['hasOptionalFileInputs'])) {
+ $this->hasOptionalFileInputs = $vals['hasOptionalFileInputs'];
+ }
}
}
@@ -234,6 +245,13 @@ class ApplicationInterfaceDescription {
$xfer += $input->skip($ftype);
}
break;
+ case 8:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->hasOptionalFileInputs);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -318,6 +336,11 @@ class ApplicationInterfaceDescription {
$xfer += $output->writeBool($this->archiveWorkingDirectory);
$xfer += $output->writeFieldEnd();
}
+ if ($this->hasOptionalFileInputs !== null) {
+ $xfer += $output->writeFieldBegin('hasOptionalFileInputs', TType::BOOL, 8);
+ $xfer += $output->writeBool($this->hasOptionalFileInputs);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
index 4cadd1e..757058a 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
@@ -42,6 +42,7 @@ class ApplicationInterfaceDescription:
- applicationInputs
- applicationOutputs
- archiveWorkingDirectory
+ - hasOptionalFileInputs
"""
thrift_spec = (
@@ -53,9 +54,10 @@ class ApplicationInterfaceDescription:
(5, TType.LIST, 'applicationInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 5
(6, TType.LIST, 'applicationOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 6
(7, TType.BOOL, 'archiveWorkingDirectory', None, False, ), # 7
+ (8, TType.BOOL, 'hasOptionalFileInputs', None, None, ), # 8
)
- def __init__(self, applicationInterfaceId=thrift_spec[1][4], applicationName=None, applicationDescription=None, applicationModules=None, applicationInputs=None, applicationOutputs=None, archiveWorkingDirectory=thrift_spec[7][4],):
+ def __init__(self, applicationInterfaceId=thrift_spec[1][4], applicationName=None, applicationDescription=None, applicationModules=None, applicationInputs=None, applicationOutputs=None, archiveWorkingDirectory=thrift_spec[7][4], hasOptionalFileInputs=None,):
self.applicationInterfaceId = applicationInterfaceId
self.applicationName = applicationName
self.applicationDescription = applicationDescription
@@ -63,6 +65,7 @@ class ApplicationInterfaceDescription:
self.applicationInputs = applicationInputs
self.applicationOutputs = applicationOutputs
self.archiveWorkingDirectory = archiveWorkingDirectory
+ self.hasOptionalFileInputs = hasOptionalFileInputs
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:
@@ -125,6 +128,11 @@ class ApplicationInterfaceDescription:
self.archiveWorkingDirectory = iprot.readBool()
else:
iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.BOOL:
+ self.hasOptionalFileInputs = iprot.readBool()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -172,6 +180,10 @@ class ApplicationInterfaceDescription:
oprot.writeFieldBegin('archiveWorkingDirectory', TType.BOOL, 7)
oprot.writeBool(self.archiveWorkingDirectory)
oprot.writeFieldEnd()
+ if self.hasOptionalFileInputs is not None:
+ oprot.writeFieldBegin('hasOptionalFileInputs', TType.BOOL, 8)
+ oprot.writeBool(self.hasOptionalFileInputs)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -192,6 +204,7 @@ class ApplicationInterfaceDescription:
value = (value * 31) ^ hash(self.applicationInputs)
value = (value * 31) ^ hash(self.applicationOutputs)
value = (value * 31) ^ hash(self.archiveWorkingDirectory)
+ value = (value * 31) ^ hash(self.hasOptionalFileInputs)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index c8cf23b..67f4495 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 319bce0..c0e2c31 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index 504aca0..2909325 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 6b0a24c..ad292ab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 80ff137..62de7a7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 6a6b7d9..43830b2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 b5d3a0d..8b2fbe8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 7e5a9c4..d8506f4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index b39c33e..141c494 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 ec9e43e..25a639b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 656aa91..d3d6096 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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");
@@ -75,6 +75,7 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)6);
private static final org.apache.thrift.protocol.TField ARCHIVE_WORKING_DIRECTORY_FIELD_DESC = new org.apache.thrift.protocol.TField("archiveWorkingDirectory", org.apache.thrift.protocol.TType.BOOL, (short)7);
+ private static final org.apache.thrift.protocol.TField HAS_OPTIONAL_FILE_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("hasOptionalFileInputs", org.apache.thrift.protocol.TType.BOOL, (short)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -89,6 +90,7 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
private List<org.apache.airavata.model.application.io.InputDataObjectType> applicationInputs; // optional
private List<org.apache.airavata.model.application.io.OutputDataObjectType> applicationOutputs; // optional
private boolean archiveWorkingDirectory; // optional
+ private boolean hasOptionalFileInputs; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -98,7 +100,8 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
APPLICATION_MODULES((short)4, "applicationModules"),
APPLICATION_INPUTS((short)5, "applicationInputs"),
APPLICATION_OUTPUTS((short)6, "applicationOutputs"),
- ARCHIVE_WORKING_DIRECTORY((short)7, "archiveWorkingDirectory");
+ ARCHIVE_WORKING_DIRECTORY((short)7, "archiveWorkingDirectory"),
+ HAS_OPTIONAL_FILE_INPUTS((short)8, "hasOptionalFileInputs");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -127,6 +130,8 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
return APPLICATION_OUTPUTS;
case 7: // ARCHIVE_WORKING_DIRECTORY
return ARCHIVE_WORKING_DIRECTORY;
+ case 8: // HAS_OPTIONAL_FILE_INPUTS
+ return HAS_OPTIONAL_FILE_INPUTS;
default:
return null;
}
@@ -168,8 +173,9 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
// isset id assignments
private static final int __ARCHIVEWORKINGDIRECTORY_ISSET_ID = 0;
+ private static final int __HASOPTIONALFILEINPUTS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.APPLICATION_DESCRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.ARCHIVE_WORKING_DIRECTORY};
+ private static final _Fields optionals[] = {_Fields.APPLICATION_DESCRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.ARCHIVE_WORKING_DIRECTORY,_Fields.HAS_OPTIONAL_FILE_INPUTS};
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);
@@ -190,6 +196,8 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class))));
tmpMap.put(_Fields.ARCHIVE_WORKING_DIRECTORY, new org.apache.thrift.meta_data.FieldMetaData("archiveWorkingDirectory", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.HAS_OPTIONAL_FILE_INPUTS, new org.apache.thrift.meta_data.FieldMetaData("hasOptionalFileInputs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationInterfaceDescription.class, metaDataMap);
}
@@ -243,6 +251,7 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
this.applicationOutputs = __this__applicationOutputs;
}
this.archiveWorkingDirectory = other.archiveWorkingDirectory;
+ this.hasOptionalFileInputs = other.hasOptionalFileInputs;
}
public ApplicationInterfaceDescription deepCopy() {
@@ -260,6 +269,8 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
this.applicationOutputs = null;
this.archiveWorkingDirectory = false;
+ setHasOptionalFileInputsIsSet(false);
+ this.hasOptionalFileInputs = false;
}
public String getApplicationInterfaceId() {
@@ -467,6 +478,28 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ARCHIVEWORKINGDIRECTORY_ISSET_ID, value);
}
+ public boolean isHasOptionalFileInputs() {
+ return this.hasOptionalFileInputs;
+ }
+
+ public void setHasOptionalFileInputs(boolean hasOptionalFileInputs) {
+ this.hasOptionalFileInputs = hasOptionalFileInputs;
+ setHasOptionalFileInputsIsSet(true);
+ }
+
+ public void unsetHasOptionalFileInputs() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASOPTIONALFILEINPUTS_ISSET_ID);
+ }
+
+ /** Returns true if field hasOptionalFileInputs is set (has been assigned a value) and false otherwise */
+ public boolean isSetHasOptionalFileInputs() {
+ return EncodingUtils.testBit(__isset_bitfield, __HASOPTIONALFILEINPUTS_ISSET_ID);
+ }
+
+ public void setHasOptionalFileInputsIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASOPTIONALFILEINPUTS_ISSET_ID, value);
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case APPLICATION_INTERFACE_ID:
@@ -525,6 +558,14 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
}
break;
+ case HAS_OPTIONAL_FILE_INPUTS:
+ if (value == null) {
+ unsetHasOptionalFileInputs();
+ } else {
+ setHasOptionalFileInputs((Boolean)value);
+ }
+ break;
+
}
}
@@ -551,6 +592,9 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
case ARCHIVE_WORKING_DIRECTORY:
return isArchiveWorkingDirectory();
+ case HAS_OPTIONAL_FILE_INPUTS:
+ return isHasOptionalFileInputs();
+
}
throw new IllegalStateException();
}
@@ -576,6 +620,8 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
return isSetApplicationOutputs();
case ARCHIVE_WORKING_DIRECTORY:
return isSetArchiveWorkingDirectory();
+ case HAS_OPTIONAL_FILE_INPUTS:
+ return isSetHasOptionalFileInputs();
}
throw new IllegalStateException();
}
@@ -656,6 +702,15 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
return false;
}
+ boolean this_present_hasOptionalFileInputs = true && this.isSetHasOptionalFileInputs();
+ boolean that_present_hasOptionalFileInputs = true && that.isSetHasOptionalFileInputs();
+ if (this_present_hasOptionalFileInputs || that_present_hasOptionalFileInputs) {
+ if (!(this_present_hasOptionalFileInputs && that_present_hasOptionalFileInputs))
+ return false;
+ if (this.hasOptionalFileInputs != that.hasOptionalFileInputs)
+ return false;
+ }
+
return true;
}
@@ -698,6 +753,11 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
if (present_archiveWorkingDirectory)
list.add(archiveWorkingDirectory);
+ boolean present_hasOptionalFileInputs = true && (isSetHasOptionalFileInputs());
+ list.add(present_hasOptionalFileInputs);
+ if (present_hasOptionalFileInputs)
+ list.add(hasOptionalFileInputs);
+
return list.hashCode();
}
@@ -779,6 +839,16 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetHasOptionalFileInputs()).compareTo(other.isSetHasOptionalFileInputs());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetHasOptionalFileInputs()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasOptionalFileInputs, other.hasOptionalFileInputs);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -860,6 +930,12 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
sb.append(this.archiveWorkingDirectory);
first = false;
}
+ if (isSetHasOptionalFileInputs()) {
+ if (!first) sb.append(", ");
+ sb.append("hasOptionalFileInputs:");
+ sb.append(this.hasOptionalFileInputs);
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1001,6 +1077,14 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 8: // HAS_OPTIONAL_FILE_INPUTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.hasOptionalFileInputs = iprot.readBool();
+ struct.setHasOptionalFileInputsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1078,6 +1162,11 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
oprot.writeBool(struct.archiveWorkingDirectory);
oprot.writeFieldEnd();
}
+ if (struct.isSetHasOptionalFileInputs()) {
+ oprot.writeFieldBegin(HAS_OPTIONAL_FILE_INPUTS_FIELD_DESC);
+ oprot.writeBool(struct.hasOptionalFileInputs);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1113,7 +1202,10 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
if (struct.isSetArchiveWorkingDirectory()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.isSetHasOptionalFileInputs()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
if (struct.isSetApplicationDescription()) {
oprot.writeString(struct.applicationDescription);
}
@@ -1147,6 +1239,9 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
if (struct.isSetArchiveWorkingDirectory()) {
oprot.writeBool(struct.archiveWorkingDirectory);
}
+ if (struct.isSetHasOptionalFileInputs()) {
+ oprot.writeBool(struct.hasOptionalFileInputs);
+ }
}
@Override
@@ -1156,7 +1251,7 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
struct.setApplicationInterfaceIdIsSet(true);
struct.applicationName = iprot.readString();
struct.setApplicationNameIsSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.applicationDescription = iprot.readString();
struct.setApplicationDescriptionIsSet(true);
@@ -1206,6 +1301,10 @@ public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<
struct.archiveWorkingDirectory = iprot.readBool();
struct.setArchiveWorkingDirectoryIsSet(true);
}
+ if (incoming.get(5)) {
+ struct.hasOptionalFileInputs = iprot.readBool();
+ struct.setHasOptionalFileInputsIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 4bc3759..d572df7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 1d7ead2..648139f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 734f811..fd28a7a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 848d67d..baa05e5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 5efce96..9034eb6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 79921f0..7fae4fb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 a23ce6b..043ea3b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 fcde9cf..1de24f8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 4a1e226..dec2256 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 92fbe10..524888d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 6d8eb1e..b27d3bc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* identityServerPwdCredToken:
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index a6ba128..dd0949c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index 45e1fb9..c159cd3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 5607ce8..7eb3f0b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 6b20f57..a02d3a6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 66ee2a4..9807d44 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 e0539ac..9d81f4c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 623eef5..57494ba 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 61cb093..d3066d3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 0888ebe..b70acb9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index e5aeb25..d10cf9b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index a10d18c..c0ce0fc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 9a8128a..471eb25 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
index bfab932..38c5056 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class DataProductModel implements org.apache.thrift.TBase<DataProductModel, DataProductModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataProductModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataProductModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
index b31b954..d163609 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 28f426e..40145be 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 1ad8c4d..20e109d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 4e4e109..57d3440 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 48b7ceb..5f4a333 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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");
[33/53] [abbrv] airavata git commit: fixing query typo
Posted by sh...@apache.org.
fixing query typo
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/35d07069
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/35d07069
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/35d07069
Branch: refs/heads/master
Commit: 35d07069104fff15ff6ff0aaf1d41217b3ee86c6
Parents: 233e614
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 18:13:06 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 18:13:06 2016 -0400
----------------------------------------------------------------------
.../registry/core/experiment/catalog/resources/WorkerResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/35d07069/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index 44e474b..5fdc265 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -600,7 +600,7 @@ public class WorkerResource extends AbstractExpCatResource {
if(accessibleIds != null){
query += " e.experimentId IN (";
for(String id : accessibleIds)
- query += (id + ",");
+ query += ("'" + id + "'" + ",");
query = query.substring(0, query.length()-1) + ") AND ";
}
[20/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 634301f..c1d24c1 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
@@ -463,67 +463,35 @@ class Iface:
"""
pass
- def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
+ def searchProjects(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
-
- Search User Projects by Project Name
- Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
-
- @param gatewayId
- The unique 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.
-
- @param limit
- The amount results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - projectName
- - limit
- - offset
- """
- pass
-
- def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
- """
-
- Search User Projects by Project Description
- Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
-
- @param gatewayId
- The unique identifier of the gateway making the request.
-
- @param userName
- The identifier of the user.
-
- @param description
- The description to be matched.
-
- @param limit
- The amount results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
-
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
Parameters:
- authzToken
- gatewayId
- userName
- - description
+ - filters
- limit
- offset
"""
@@ -4191,124 +4159,55 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProjects failed: unknown result")
- def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
- """
-
- Search User Projects by Project Name
- Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
-
- @param gatewayId
- The unique 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.
-
- @param limit
- The amount results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- - userName
- - projectName
- - limit
- - offset
- """
- self.send_searchProjectsByProjectName(authzToken, gatewayId, userName, projectName, limit, offset)
- return self.recv_searchProjectsByProjectName()
-
- 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
- args.projectName = projectName
- args.limit = limit
- args.offset = offset
- 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
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result")
-
- def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
+ def searchProjects(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
-
- Search User Projects by Project Description
- Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
-
- @param gatewayId
- The unique identifier of the gateway making the request.
-
- @param userName
- The identifier of the user.
-
- @param description
- The description to be matched.
-
- @param limit
- The amount results to be fetched.
-
- @param offset
- The starting point of the results to be fetched.
-
-
+ *
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
+ *
+ *
Parameters:
- authzToken
- gatewayId
- userName
- - description
+ - filters
- limit
- offset
"""
- self.send_searchProjectsByProjectDesc(authzToken, gatewayId, userName, description, limit, offset)
- return self.recv_searchProjectsByProjectDesc()
+ self.send_searchProjects(authzToken, gatewayId, userName, filters, limit, offset)
+ return self.recv_searchProjects()
- def send_searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
- self._oprot.writeMessageBegin('searchProjectsByProjectDesc', TMessageType.CALL, self._seqid)
- args = searchProjectsByProjectDesc_args()
+ def send_searchProjects(self, authzToken, gatewayId, userName, filters, limit, offset):
+ self._oprot.writeMessageBegin('searchProjects', TMessageType.CALL, self._seqid)
+ args = searchProjects_args()
args.authzToken = authzToken
args.gatewayId = gatewayId
args.userName = userName
- args.description = description
+ args.filters = filters
args.limit = limit
args.offset = offset
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_searchProjectsByProjectDesc(self):
+ def recv_searchProjects(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -4316,7 +4215,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = searchProjectsByProjectDesc_result()
+ result = searchProjects_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -4329,7 +4228,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result")
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjects failed: unknown result")
def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
"""
@@ -10550,8 +10449,7 @@ class Processor(Iface, TProcessor):
self._processMap["getProject"] = Processor.process_getProject
self._processMap["deleteProject"] = Processor.process_deleteProject
self._processMap["getUserProjects"] = Processor.process_getUserProjects
- self._processMap["searchProjectsByProjectName"] = Processor.process_searchProjectsByProjectName
- self._processMap["searchProjectsByProjectDesc"] = Processor.process_searchProjectsByProjectDesc
+ self._processMap["searchProjects"] = Processor.process_searchProjects
self._processMap["searchExperiments"] = Processor.process_searchExperiments
self._processMap["getExperimentStatistics"] = Processor.process_getExperimentStatistics
self._processMap["getExperimentsInProject"] = Processor.process_getExperimentsInProject
@@ -11476,44 +11374,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_searchProjectsByProjectName(self, seqid, iprot, oprot):
- args = searchProjectsByProjectName_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = searchProjectsByProjectName_result()
- try:
- result.success = self._handler.searchProjectsByProjectName(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchProjectsByProjectName", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_searchProjectsByProjectDesc(self, seqid, iprot, oprot):
- args = searchProjectsByProjectDesc_args()
+ def process_searchProjects(self, seqid, iprot, oprot):
+ args = searchProjects_args()
args.read(iprot)
iprot.readMessageEnd()
- result = searchProjectsByProjectDesc_result()
+ result = searchProjects_result()
try:
- result.success = self._handler.searchProjectsByProjectDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
+ result.success = self._handler.searchProjects(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -11533,7 +11400,7 @@ class Processor(Iface, TProcessor):
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("searchProjectsByProjectDesc", msg_type, seqid)
+ oprot.writeMessageBegin("searchProjects", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -20583,13 +20450,13 @@ class getUserProjects_result:
def __ne__(self, other):
return not (self == other)
-class searchProjectsByProjectName_args:
+class searchProjects_args:
"""
Attributes:
- authzToken
- gatewayId
- userName
- - projectName
+ - filters
- limit
- offset
"""
@@ -20599,16 +20466,16 @@ class searchProjectsByProjectName_args:
(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
- (4, TType.STRING, 'projectName', None, None, ), # 4
+ (4, TType.MAP, 'filters', (TType.I32,None,TType.STRING,None), None, ), # 4
(5, TType.I32, 'limit', None, None, ), # 5
(6, TType.I32, 'offset', None, None, ), # 6
)
- def __init__(self, authzToken=None, gatewayId=None, userName=None, projectName=None, limit=None, offset=None,):
+ def __init__(self, authzToken=None, gatewayId=None, userName=None, filters=None, limit=None, offset=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
self.userName = userName
- self.projectName = projectName
+ self.filters = filters
self.limit = limit
self.offset = offset
@@ -20638,280 +20505,14 @@ class searchProjectsByProjectName_args:
else:
iprot.skip(ftype)
elif fid == 4:
- if ftype == TType.STRING:
- self.projectName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.I32:
- self.limit = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.I32:
- self.offset = iprot.readI32()
- 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('searchProjectsByProjectName_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, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.projectName is not None:
- oprot.writeFieldBegin('projectName', TType.STRING, 4)
- oprot.writeString(self.projectName)
- oprot.writeFieldEnd()
- if self.limit is not None:
- oprot.writeFieldBegin('limit', TType.I32, 5)
- oprot.writeI32(self.limit)
- oprot.writeFieldEnd()
- if self.offset is not None:
- oprot.writeFieldBegin('offset', TType.I32, 6)
- oprot.writeI32(self.offset)
- 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:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.projectName is None:
- raise TProtocol.TProtocolException(message='Required field projectName is unset!')
- if self.limit is None:
- raise TProtocol.TProtocolException(message='Required field limit is unset!')
- if self.offset is None:
- raise TProtocol.TProtocolException(message='Required field offset is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.projectName)
- value = (value * 31) ^ hash(self.limit)
- value = (value * 31) ^ hash(self.offset)
- 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 searchProjectsByProjectName_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype49, _size46) = iprot.readListBegin()
+ if ftype == TType.MAP:
+ self.filters = {}
+ (_ktype47, _vtype48, _size46 ) = iprot.readMapBegin()
for _i50 in xrange(_size46):
- _elem51 = apache.airavata.model.workspace.ttypes.Project()
- _elem51.read(iprot)
- self.success.append(_elem51)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('searchProjectsByProjectName_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter52 in self.success:
- iter52.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- 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.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 searchProjectsByProjectDesc_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - userName
- - description
- - limit
- - offset
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRING, 'userName', None, None, ), # 3
- (4, TType.STRING, 'description', None, None, ), # 4
- (5, TType.I32, 'limit', None, None, ), # 5
- (6, TType.I32, 'offset', None, None, ), # 6
- )
-
- def __init__(self, authzToken=None, gatewayId=None, userName=None, description=None, limit=None, offset=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.description = description
- self.limit = limit
- self.offset = offset
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.description = iprot.readString()
+ _key51 = iprot.readI32()
+ _val52 = iprot.readString()
+ self.filters[_key51] = _val52
+ iprot.readMapEnd()
else:
iprot.skip(ftype)
elif fid == 5:
@@ -20933,7 +20534,7 @@ class searchProjectsByProjectDesc_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchProjectsByProjectDesc_args')
+ oprot.writeStructBegin('searchProjects_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -20946,9 +20547,13 @@ class searchProjectsByProjectDesc_args:
oprot.writeFieldBegin('userName', TType.STRING, 3)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
- oprot.writeString(self.description)
+ if self.filters is not None:
+ oprot.writeFieldBegin('filters', TType.MAP, 4)
+ oprot.writeMapBegin(TType.I32, TType.STRING, len(self.filters))
+ for kiter53,viter54 in self.filters.items():
+ oprot.writeI32(kiter53)
+ oprot.writeString(viter54)
+ oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.limit is not None:
oprot.writeFieldBegin('limit', TType.I32, 5)
@@ -20968,8 +20573,6 @@ class searchProjectsByProjectDesc_args:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.userName is None:
raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.description is None:
- raise TProtocol.TProtocolException(message='Required field description is unset!')
if self.limit is None:
raise TProtocol.TProtocolException(message='Required field limit is unset!')
if self.offset is None:
@@ -20982,7 +20585,7 @@ class searchProjectsByProjectDesc_args:
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.description)
+ value = (value * 31) ^ hash(self.filters)
value = (value * 31) ^ hash(self.limit)
value = (value * 31) ^ hash(self.offset)
return value
@@ -20998,7 +20601,7 @@ class searchProjectsByProjectDesc_args:
def __ne__(self, other):
return not (self == other)
-class searchProjectsByProjectDesc_result:
+class searchProjects_result:
"""
Attributes:
- success
@@ -21035,11 +20638,11 @@ class searchProjectsByProjectDesc_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype56, _size53) = iprot.readListBegin()
- for _i57 in xrange(_size53):
- _elem58 = apache.airavata.model.workspace.ttypes.Project()
- _elem58.read(iprot)
- self.success.append(_elem58)
+ (_etype58, _size55) = iprot.readListBegin()
+ for _i59 in xrange(_size55):
+ _elem60 = apache.airavata.model.workspace.ttypes.Project()
+ _elem60.read(iprot)
+ self.success.append(_elem60)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21076,12 +20679,12 @@ class searchProjectsByProjectDesc_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('searchProjectsByProjectDesc_result')
+ oprot.writeStructBegin('searchProjects_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter59 in self.success:
- iter59.write(oprot)
+ for iter61 in self.success:
+ iter61.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21184,11 +20787,11 @@ class searchExperiments_args:
elif fid == 4:
if ftype == TType.MAP:
self.filters = {}
- (_ktype61, _vtype62, _size60 ) = iprot.readMapBegin()
- for _i64 in xrange(_size60):
- _key65 = iprot.readI32()
- _val66 = iprot.readString()
- self.filters[_key65] = _val66
+ (_ktype63, _vtype64, _size62 ) = iprot.readMapBegin()
+ for _i66 in xrange(_size62):
+ _key67 = iprot.readI32()
+ _val68 = iprot.readString()
+ self.filters[_key67] = _val68
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -21227,9 +20830,9 @@ class searchExperiments_args:
if self.filters is not None:
oprot.writeFieldBegin('filters', TType.MAP, 4)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.filters))
- for kiter67,viter68 in self.filters.items():
- oprot.writeI32(kiter67)
- oprot.writeString(viter68)
+ for kiter69,viter70 in self.filters.items():
+ oprot.writeI32(kiter69)
+ oprot.writeString(viter70)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.limit is not None:
@@ -21315,11 +20918,11 @@ class searchExperiments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype72, _size69) = iprot.readListBegin()
- for _i73 in xrange(_size69):
- _elem74 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem74.read(iprot)
- self.success.append(_elem74)
+ (_etype74, _size71) = iprot.readListBegin()
+ for _i75 in xrange(_size71):
+ _elem76 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem76.read(iprot)
+ self.success.append(_elem76)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21360,8 +20963,8 @@ class searchExperiments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter75 in self.success:
- iter75.write(oprot)
+ for iter77 in self.success:
+ iter77.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21794,11 +21397,11 @@ class getExperimentsInProject_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype79, _size76) = iprot.readListBegin()
- for _i80 in xrange(_size76):
- _elem81 = apache.airavata.model.experiment.ttypes.ExperimentModel()
- _elem81.read(iprot)
- self.success.append(_elem81)
+ (_etype81, _size78) = iprot.readListBegin()
+ for _i82 in xrange(_size78):
+ _elem83 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ _elem83.read(iprot)
+ self.success.append(_elem83)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21845,8 +21448,8 @@ class getExperimentsInProject_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter82 in self.success:
- iter82.write(oprot)
+ for iter84 in self.success:
+ iter84.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22062,11 +21665,11 @@ class getUserExperiments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype86, _size83) = iprot.readListBegin()
- for _i87 in xrange(_size83):
- _elem88 = apache.airavata.model.experiment.ttypes.ExperimentModel()
- _elem88.read(iprot)
- self.success.append(_elem88)
+ (_etype88, _size85) = iprot.readListBegin()
+ for _i89 in xrange(_size85):
+ _elem90 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ _elem90.read(iprot)
+ self.success.append(_elem90)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22107,8 +21710,8 @@ class getUserExperiments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter89 in self.success:
- iter89.write(oprot)
+ for iter91 in self.success:
+ iter91.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24341,11 +23944,11 @@ class getExperimentOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype93, _size90) = iprot.readListBegin()
- for _i94 in xrange(_size90):
- _elem95 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem95.read(iprot)
- self.success.append(_elem95)
+ (_etype95, _size92) = iprot.readListBegin()
+ for _i96 in xrange(_size92):
+ _elem97 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem97.read(iprot)
+ self.success.append(_elem97)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24392,8 +23995,8 @@ class getExperimentOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter96 in self.success:
- iter96.write(oprot)
+ for iter98 in self.success:
+ iter98.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24567,11 +24170,11 @@ class getIntermediateOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype100, _size97) = iprot.readListBegin()
- for _i101 in xrange(_size97):
- _elem102 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem102.read(iprot)
- self.success.append(_elem102)
+ (_etype102, _size99) = iprot.readListBegin()
+ for _i103 in xrange(_size99):
+ _elem104 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem104.read(iprot)
+ self.success.append(_elem104)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24618,8 +24221,8 @@ class getIntermediateOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter103 in self.success:
- iter103.write(oprot)
+ for iter105 in self.success:
+ iter105.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24793,12 +24396,12 @@ class getJobStatuses_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype105, _vtype106, _size104 ) = iprot.readMapBegin()
- for _i108 in xrange(_size104):
- _key109 = iprot.readString()
- _val110 = apache.airavata.model.status.ttypes.JobStatus()
- _val110.read(iprot)
- self.success[_key109] = _val110
+ (_ktype107, _vtype108, _size106 ) = iprot.readMapBegin()
+ for _i110 in xrange(_size106):
+ _key111 = iprot.readString()
+ _val112 = apache.airavata.model.status.ttypes.JobStatus()
+ _val112.read(iprot)
+ self.success[_key111] = _val112
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -24845,9 +24448,9 @@ class getJobStatuses_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
- for kiter111,viter112 in self.success.items():
- oprot.writeString(kiter111)
- viter112.write(oprot)
+ for kiter113,viter114 in self.success.items():
+ oprot.writeString(kiter113)
+ viter114.write(oprot)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -25021,11 +24624,11 @@ class getJobDetails_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype116, _size113) = iprot.readListBegin()
- for _i117 in xrange(_size113):
- _elem118 = apache.airavata.model.job.ttypes.JobModel()
- _elem118.read(iprot)
- self.success.append(_elem118)
+ (_etype118, _size115) = iprot.readListBegin()
+ for _i119 in xrange(_size115):
+ _elem120 = apache.airavata.model.job.ttypes.JobModel()
+ _elem120.read(iprot)
+ self.success.append(_elem120)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -25072,8 +24675,8 @@ class getJobDetails_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter119 in self.success:
- iter119.write(oprot)
+ for iter121 in self.success:
+ iter121.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26330,11 +25933,11 @@ class getAllAppModules_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype123, _size120) = iprot.readListBegin()
- for _i124 in xrange(_size120):
- _elem125 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem125.read(iprot)
- self.success.append(_elem125)
+ (_etype125, _size122) = iprot.readListBegin()
+ for _i126 in xrange(_size122):
+ _elem127 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem127.read(iprot)
+ self.success.append(_elem127)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26375,8 +25978,8 @@ class getAllAppModules_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter126 in self.success:
- iter126.write(oprot)
+ for iter128 in self.success:
+ iter128.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -27590,11 +27193,11 @@ class getAllApplicationDeployments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype130, _size127) = iprot.readListBegin()
- for _i131 in xrange(_size127):
- _elem132 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem132.read(iprot)
- self.success.append(_elem132)
+ (_etype132, _size129) = iprot.readListBegin()
+ for _i133 in xrange(_size129):
+ _elem134 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem134.read(iprot)
+ self.success.append(_elem134)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -27635,8 +27238,8 @@ class getAllApplicationDeployments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter133 in self.success:
- iter133.write(oprot)
+ for iter135 in self.success:
+ iter135.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -27802,10 +27405,10 @@ class getAppModuleDeployedResources_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype137, _size134) = iprot.readListBegin()
- for _i138 in xrange(_size134):
- _elem139 = iprot.readString()
- self.success.append(_elem139)
+ (_etype139, _size136) = iprot.readListBegin()
+ for _i140 in xrange(_size136):
+ _elem141 = iprot.readString()
+ self.success.append(_elem141)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -27846,8 +27449,8 @@ class getAppModuleDeployedResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter140 in self.success:
- oprot.writeString(iter140)
+ for iter142 in self.success:
+ oprot.writeString(iter142)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29085,11 +28688,11 @@ class getAllApplicationInterfaceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype142, _vtype143, _size141 ) = iprot.readMapBegin()
- for _i145 in xrange(_size141):
- _key146 = iprot.readString()
- _val147 = iprot.readString()
- self.success[_key146] = _val147
+ (_ktype144, _vtype145, _size143 ) = iprot.readMapBegin()
+ for _i147 in xrange(_size143):
+ _key148 = iprot.readString()
+ _val149 = iprot.readString()
+ self.success[_key148] = _val149
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -29130,9 +28733,9 @@ class getAllApplicationInterfaceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter148,viter149 in self.success.items():
- oprot.writeString(kiter148)
- oprot.writeString(viter149)
+ for kiter150,viter151 in self.success.items():
+ oprot.writeString(kiter150)
+ oprot.writeString(viter151)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29298,11 +28901,11 @@ class getAllApplicationInterfaces_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype153, _size150) = iprot.readListBegin()
- for _i154 in xrange(_size150):
- _elem155 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
- _elem155.read(iprot)
- self.success.append(_elem155)
+ (_etype155, _size152) = iprot.readListBegin()
+ for _i156 in xrange(_size152):
+ _elem157 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+ _elem157.read(iprot)
+ self.success.append(_elem157)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29343,8 +28946,8 @@ class getAllApplicationInterfaces_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter156 in self.success:
- iter156.write(oprot)
+ for iter158 in self.success:
+ iter158.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29510,11 +29113,11 @@ class getApplicationInputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype160, _size157) = iprot.readListBegin()
- for _i161 in xrange(_size157):
- _elem162 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
- _elem162.read(iprot)
- self.success.append(_elem162)
+ (_etype162, _size159) = iprot.readListBegin()
+ for _i163 in xrange(_size159):
+ _elem164 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem164.read(iprot)
+ self.success.append(_elem164)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29555,8 +29158,8 @@ class getApplicationInputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter163 in self.success:
- iter163.write(oprot)
+ for iter165 in self.success:
+ iter165.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29722,11 +29325,11 @@ class getApplicationOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype167, _size164) = iprot.readListBegin()
- for _i168 in xrange(_size164):
- _elem169 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem169.read(iprot)
- self.success.append(_elem169)
+ (_etype169, _size166) = iprot.readListBegin()
+ for _i170 in xrange(_size166):
+ _elem171 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem171.read(iprot)
+ self.success.append(_elem171)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29767,8 +29370,8 @@ class getApplicationOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter170 in self.success:
- iter170.write(oprot)
+ for iter172 in self.success:
+ iter172.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29934,11 +29537,11 @@ class getAvailableAppInterfaceComputeResources_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype172, _vtype173, _size171 ) = iprot.readMapBegin()
- for _i175 in xrange(_size171):
- _key176 = iprot.readString()
- _val177 = iprot.readString()
- self.success[_key176] = _val177
+ (_ktype174, _vtype175, _size173 ) = iprot.readMapBegin()
+ for _i177 in xrange(_size173):
+ _key178 = iprot.readString()
+ _val179 = iprot.readString()
+ self.success[_key178] = _val179
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -29979,9 +29582,9 @@ class getAvailableAppInterfaceComputeResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter178,viter179 in self.success.items():
- oprot.writeString(kiter178)
- oprot.writeString(viter179)
+ for kiter180,viter181 in self.success.items():
+ oprot.writeString(kiter180)
+ oprot.writeString(viter181)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -30540,11 +30143,11 @@ class getAllComputeResourceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype181, _vtype182, _size180 ) = iprot.readMapBegin()
- for _i184 in xrange(_size180):
- _key185 = iprot.readString()
- _val186 = iprot.readString()
- self.success[_key185] = _val186
+ (_ktype183, _vtype184, _size182 ) = iprot.readMapBegin()
+ for _i186 in xrange(_size182):
+ _key187 = iprot.readString()
+ _val188 = iprot.readString()
+ self.success[_key187] = _val188
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -30585,9 +30188,9 @@ class getAllComputeResourceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter187,viter188 in self.success.items():
- oprot.writeString(kiter187)
- oprot.writeString(viter188)
+ for kiter189,viter190 in self.success.items():
+ oprot.writeString(kiter189)
+ oprot.writeString(viter190)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -31568,11 +31171,11 @@ class getAllStorageResourceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype190, _vtype191, _size189 ) = iprot.readMapBegin()
- for _i193 in xrange(_size189):
- _key194 = iprot.readString()
- _val195 = iprot.readString()
- self.success[_key194] = _val195
+ (_ktype192, _vtype193, _size191 ) = iprot.readMapBegin()
+ for _i195 in xrange(_size191):
+ _key196 = iprot.readString()
+ _val197 = iprot.readString()
+ self.success[_key196] = _val197
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -31613,9 +31216,9 @@ class getAllStorageResourceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter196,viter197 in self.success.items():
- oprot.writeString(kiter196)
- oprot.writeString(viter197)
+ for kiter198,viter199 in self.success.items():
+ oprot.writeString(kiter198)
+ oprot.writeString(viter199)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -38104,11 +37707,11 @@ class changeJobSubmissionPriorities_args:
elif fid == 2:
if ftype == TType.MAP:
self.jobSubmissionPriorityMap = {}
- (_ktype199, _vtype200, _size198 ) = iprot.readMapBegin()
- for _i202 in xrange(_size198):
- _key203 = iprot.readString()
- _val204 = iprot.readI32()
- self.jobSubmissionPriorityMap[_key203] = _val204
+ (_ktype201, _vtype202, _size200 ) = iprot.readMapBegin()
+ for _i204 in xrange(_size200):
+ _key205 = iprot.readString()
+ _val206 = iprot.readI32()
+ self.jobSubmissionPriorityMap[_key205] = _val206
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -38129,9 +37732,9 @@ class changeJobSubmissionPriorities_args:
if self.jobSubmissionPriorityMap is not None:
oprot.writeFieldBegin('jobSubmissionPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.jobSubmissionPriorityMap))
- for kiter205,viter206 in self.jobSubmissionPriorityMap.items():
- oprot.writeString(kiter205)
- oprot.writeI32(viter206)
+ for kiter207,viter208 in self.jobSubmissionPriorityMap.items():
+ oprot.writeString(kiter207)
+ oprot.writeI32(viter208)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -38317,11 +37920,11 @@ class changeDataMovementPriorities_args:
elif fid == 2:
if ftype == TType.MAP:
self.dataMovementPriorityMap = {}
- (_ktype208, _vtype209, _size207 ) = iprot.readMapBegin()
- for _i211 in xrange(_size207):
- _key212 = iprot.readString()
- _val213 = iprot.readI32()
- self.dataMovementPriorityMap[_key212] = _val213
+ (_ktype210, _vtype211, _size209 ) = iprot.readMapBegin()
+ for _i213 in xrange(_size209):
+ _key214 = iprot.readString()
+ _val215 = iprot.readI32()
+ self.dataMovementPriorityMap[_key214] = _val215
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -38342,9 +37945,9 @@ class changeDataMovementPriorities_args:
if self.dataMovementPriorityMap is not None:
oprot.writeFieldBegin('dataMovementPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.dataMovementPriorityMap))
- for kiter214,viter215 in self.dataMovementPriorityMap.items():
- oprot.writeString(kiter214)
- oprot.writeI32(viter215)
+ for kiter216,viter217 in self.dataMovementPriorityMap.items():
+ oprot.writeString(kiter216)
+ oprot.writeI32(viter217)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -41850,11 +41453,11 @@ class getAllGatewayComputeResourcePreferences_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype219, _size216) = iprot.readListBegin()
- for _i220 in xrange(_size216):
- _elem221 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
- _elem221.read(iprot)
- self.success.append(_elem221)
+ (_etype221, _size218) = iprot.readListBegin()
+ for _i222 in xrange(_size218):
+ _elem223 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+ _elem223.read(iprot)
+ self.success.append(_elem223)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -41895,8 +41498,8 @@ class getAllGatewayComputeResourcePreferences_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter222 in self.success:
- iter222.write(oprot)
+ for iter224 in self.success:
+ iter224.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -42062,11 +41665,11 @@ class getAllGatewayStoragePreferences_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype226, _size223) = iprot.readListBegin()
- for _i227 in xrange(_size223):
- _elem228 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
- _elem228.read(iprot)
- self.success.append(_elem228)
+ (_etype228, _size225) = iprot.readListBegin()
+ for _i229 in xrange(_size225):
+ _elem230 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+ _elem230.read(iprot)
+ self.success.append(_elem230)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -42107,8 +41710,8 @@ class getAllGatewayStoragePreferences_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter229 in self.success:
- iter229.write(oprot)
+ for iter231 in self.success:
+ iter231.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -42259,11 +41862,11 @@ class getAllGatewayResourceProfiles_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype233, _size230) = iprot.readListBegin()
- for _i234 in xrange(_size230):
- _elem235 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
- _elem235.read(iprot)
- self.success.append(_elem235)
+ (_etype235, _size232) = iprot.readListBegin()
+ for _i236 in xrange(_size232):
+ _elem237 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+ _elem237.read(iprot)
+ self.success.append(_elem237)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -42304,8 +41907,8 @@ class getAllGatewayResourceProfiles_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter236 in self.success:
- iter236.write(oprot)
+ for iter238 in self.success:
+ iter238.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -43375,10 +42978,10 @@ class getAllWorkflows_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype240, _size237) = iprot.readListBegin()
- for _i241 in xrange(_size237):
- _elem242 = iprot.readString()
- self.success.append(_elem242)
+ (_etype242, _size239) = iprot.readListBegin()
+ for _i243 in xrange(_size239):
+ _elem244 = iprot.readString()
+ self.success.append(_elem244)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -43419,8 +43022,8 @@ class getAllWorkflows_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter243 in self.success:
- oprot.writeString(iter243)
+ for iter245 in self.success:
+ oprot.writeString(iter245)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -45629,11 +45232,11 @@ class getChildDataProducts_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype247, _size244) = iprot.readListBegin()
- for _i248 in xrange(_size244):
- _elem249 = apache.airavata.model.data.replica.ttypes.DataProductModel()
- _elem249.read(iprot)
- self.success.append(_elem249)
+ (_etype249, _size246) = iprot.readListBegin()
+ for _i250 in xrange(_size246):
+ _elem251 = apache.airavata.model.data.replica.ttypes.DataProductModel()
+ _elem251.read(iprot)
+ self.success.append(_elem251)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -45674,8 +45277,8 @@ class getChildDataProducts_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter250 in self.success:
- iter250.write(oprot)
+ for iter252 in self.success:
+ iter252.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
index afc6510..75f6271 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
@@ -65,6 +65,20 @@ class ExperimentSearchFields:
"PROJECT_ID": 6,
}
+class ProjectSearchFields:
+ PROJECT_NAME = 0
+ PROJECT_DESCRIPTION = 1
+
+ _VALUES_TO_NAMES = {
+ 0: "PROJECT_NAME",
+ 1: "PROJECT_DESCRIPTION",
+ }
+
+ _NAMES_TO_VALUES = {
+ "PROJECT_NAME": 0,
+ "PROJECT_DESCRIPTION": 1,
+ }
+
class UserConfigurationDataModel:
"""
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index af94943..5dad27e 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -484,42 +484,12 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- /**
- *
- * Search User Projects by Project Name
- * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique 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.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- **/
- list<workspace_model.Project> searchProjectsByProjectName (1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required string projectName,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
/**
*
- * Search User Projects by Project Description
- * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
*
* @param gatewayId
* The unique identifier of the gateway making the request.
@@ -527,8 +497,8 @@ service Airavata {
* @param userName
* The identifier of the user.
*
- * @param description
- * The description to be matched.
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
*
* @param limit
* The amount results to be fetched.
@@ -537,16 +507,16 @@ service Airavata {
* The starting point of the results to be fetched.
*
**/
- list<workspace_model.Project> searchProjectsByProjectDesc(1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required string description,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
+ list<workspace_model.Project> searchProjects(1: required security_model.AuthzToken authzToken,
+ 2: required string gatewayId,
+ 3: required string userName,
+ 4: map<experiment_model.ProjectSearchFields, string> filters,
+ 5: required i32 limit,
+ 6: required i32 offset)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.AiravataClientException ace,
+ 3: airavata_errors.AiravataSystemException ase,
+ 4: airavata_errors.AuthorizationException ae)
/**
* Search Experiments.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
index 06879eb..e25e16e 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
@@ -43,6 +43,12 @@ enum ExperimentSearchFields {
STATUS,
PROJECT_ID
}
+
+enum ProjectSearchFields {
+ PROJECT_NAME,
+ PROJECT_DESCRIPTION
+}
+
/**
* A structure holding the experiment configuration.
*
[38/53] [abbrv] airavata git commit: Added servers script parameter
Posted by sh...@apache.org.
Added servers script parameter
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e390839
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e390839
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e390839
Branch: refs/heads/master
Commit: 8e390839587a31fd8adc40ea3e67f73d68459f2b
Parents: b673bcd
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Jun 22 11:52:08 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:32:37 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/bin/airavata-server-start.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e390839/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
index 44adad0..6e1e412 100644
--- a/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -24,6 +24,7 @@ LOGO_FILE="logo.txt"
JAVA_OPTS=""
AIRAVATA_COMMAND=""
EXTRA_ARGS=""
+SERVERS=""
IS_DAEMON_MODE=false
LOGO=true
@@ -41,7 +42,11 @@ do
shift
;;
api | gfac | orchestrator)
- AIRAVATA_COMMAND="${AIRAVATA_COMMAND} ${var}"
+ if [ -z ${SERVERS} ] ; then
+ SERVERS="${var}"
+ else
+ SERVERS="${SERVERS},${var}"
+ fi
shift
;;
-d)
@@ -77,7 +82,7 @@ do
done
#add extra argument to the
-AIRAVATA_COMMAND="${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+AIRAVATA_COMMAND="--servers=${SERVERS} ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
#print logo file
if ${LOGO} ; then
[16/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 fb7ef28..c61c197 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
@@ -461,168 +461,6 @@ class AiravataIf {
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 User Experiments by Name
- * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user who created the experiments.
- *
- * @param expName
- * Experiment name to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param expName
- * @param limit
- * @param offset
- */
- 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 By Experiment Description
- * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @param description
- * Experiment description to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param description
- * @param limit
- * @param offset
- */
- 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 Experiment By the Application
- * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @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.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param applicationId
- * @param limit
- * @param offset
- */
- 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 User Experiments by Status
- * Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user making the request.
- *
- * @param experimentState
- * Experiement state to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param experimentState
- * @param limit
- * @param offset
- */
- 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 User Experiments by the Creation Time
- * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique 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.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- * @return ExperimentSummaryModel
- * List of experiments for the given search filter. Here only the Experiment summary will be returned.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- * @param limit
- * @param offset
- */
- 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.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
*
@@ -2783,21 +2621,6 @@ class AiravataNull : virtual public AiravataIf {
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 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 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 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 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 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 */) {
return;
}
@@ -6380,804 +6203,20 @@ class Airavata_getProject_result {
Airavata_getProject_result(const Airavata_getProject_result&);
Airavata_getProject_result& operator=(const Airavata_getProject_result&);
- Airavata_getProject_result() {
- }
-
- virtual ~Airavata_getProject_result() throw();
- ::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::ProjectNotFoundException pnfe;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getProject_result__isset __isset;
-
- void __set_success(const ::apache::airavata::model::workspace::Project& val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_pnfe(const ::apache::airavata::api::error::ProjectNotFoundException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_getProject_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(pnfe == rhs.pnfe))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_getProject_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getProject_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getProject_presult__isset {
- _Airavata_getProject_presult__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool pnfe :1;
- bool ae :1;
-} _Airavata_getProject_presult__isset;
-
-class Airavata_getProject_presult {
- public:
-
-
- virtual ~Airavata_getProject_presult() throw();
- ::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::ProjectNotFoundException pnfe;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getProject_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_deleteProject_args {
- public:
-
- Airavata_deleteProject_args(const Airavata_deleteProject_args&);
- Airavata_deleteProject_args& operator=(const Airavata_deleteProject_args&);
- Airavata_deleteProject_args() : projectId() {
- }
-
- virtual ~Airavata_deleteProject_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string projectId;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_projectId(const std::string& val);
-
- bool operator == (const Airavata_deleteProject_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(projectId == rhs.projectId))
- return false;
- return true;
- }
- bool operator != (const Airavata_deleteProject_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_deleteProject_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_deleteProject_pargs {
- public:
-
-
- virtual ~Airavata_deleteProject_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* projectId;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_deleteProject_result__isset {
- _Airavata_deleteProject_result__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool pnfe :1;
- bool ae :1;
-} _Airavata_deleteProject_result__isset;
-
-class Airavata_deleteProject_result {
- public:
-
- Airavata_deleteProject_result(const Airavata_deleteProject_result&);
- Airavata_deleteProject_result& operator=(const Airavata_deleteProject_result&);
- Airavata_deleteProject_result() : success(0) {
- }
-
- virtual ~Airavata_deleteProject_result() throw();
- bool success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::ProjectNotFoundException pnfe;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_deleteProject_result__isset __isset;
-
- void __set_success(const bool val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_pnfe(const ::apache::airavata::api::error::ProjectNotFoundException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_deleteProject_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(pnfe == rhs.pnfe))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_deleteProject_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_deleteProject_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_deleteProject_presult__isset {
- _Airavata_deleteProject_presult__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool pnfe :1;
- bool ae :1;
-} _Airavata_deleteProject_presult__isset;
-
-class Airavata_deleteProject_presult {
- public:
-
-
- virtual ~Airavata_deleteProject_presult() throw();
- bool* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::ProjectNotFoundException pnfe;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_deleteProject_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_getUserProjects_args {
- public:
-
- 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_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);
-
- 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_getUserProjects_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProjects_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_getUserProjects_pargs {
- public:
-
-
- 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;
-
-};
-
-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;
- bool ae :1;
-} _Airavata_getUserProjects_result__isset;
-
-class Airavata_getUserProjects_result {
- public:
-
- Airavata_getUserProjects_result(const Airavata_getUserProjects_result&);
- Airavata_getUserProjects_result& operator=(const Airavata_getUserProjects_result&);
- Airavata_getUserProjects_result() {
- }
-
- 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_getUserProjects_result__isset __isset;
-
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_getUserProjects_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_getUserProjects_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProjects_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-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;
- bool ae :1;
-} _Airavata_getUserProjects_presult__isset;
-
-class Airavata_getUserProjects_presult {
- public:
-
-
- 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_getUserProjects_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_searchProjectsByProjectName_args {
- public:
-
- 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_searchProjectsByProjectName_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string gatewayId;
- std::string userName;
- std::string projectName;
- 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_limit(const int32_t val);
-
- void __set_offset(const int32_t val);
-
- bool operator == (const Airavata_searchProjectsByProjectName_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- 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_searchProjectsByProjectName_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectName_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_searchProjectsByProjectName_pargs {
- public:
-
-
- 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;
-
-};
-
-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_searchProjectsByProjectName_result__isset;
-
-class Airavata_searchProjectsByProjectName_result {
- public:
-
- Airavata_searchProjectsByProjectName_result(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result& operator=(const Airavata_searchProjectsByProjectName_result&);
- Airavata_searchProjectsByProjectName_result() {
- }
-
- 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_searchProjectsByProjectName_result__isset __isset;
-
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_searchProjectsByProjectName_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_searchProjectsByProjectName_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectName_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-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_searchProjectsByProjectName_presult__isset;
-
-class Airavata_searchProjectsByProjectName_presult {
- public:
-
-
- 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_searchProjectsByProjectName_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_searchProjectsByProjectDesc_args {
- public:
-
- 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_searchProjectsByProjectDesc_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);
-
- void __set_userName(const std::string& val);
-
- void __set_description(const std::string& val);
-
- 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 (!(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 {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectDesc_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_searchProjectsByProjectDesc_pargs {
- public:
-
-
- virtual ~Airavata_searchProjectsByProjectDesc_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;
-
-};
-
-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;
- bool ae :1;
-} _Airavata_searchProjectsByProjectDesc_result__isset;
-
-class Airavata_searchProjectsByProjectDesc_result {
- public:
-
- Airavata_searchProjectsByProjectDesc_result(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result& operator=(const Airavata_searchProjectsByProjectDesc_result&);
- Airavata_searchProjectsByProjectDesc_result() {
- }
-
- 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_searchProjectsByProjectDesc_result__isset __isset;
-
- void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_searchProjectsByProjectDesc_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_searchProjectsByProjectDesc_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchProjectsByProjectDesc_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-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;
- bool ae :1;
-} _Airavata_searchProjectsByProjectDesc_presult__isset;
-
-class Airavata_searchProjectsByProjectDesc_presult {
- public:
-
-
- 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_searchProjectsByProjectDesc_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_searchExperimentsByName_args {
- public:
-
- 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_searchExperimentsByName_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string gatewayId;
- std::string userName;
- std::string expName;
- 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_expName(const std::string& val);
-
- void __set_limit(const int32_t val);
-
- void __set_offset(const int32_t val);
-
- bool operator == (const Airavata_searchExperimentsByName_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
- if (!(userName == rhs.userName))
- return false;
- if (!(expName == rhs.expName))
- return false;
- if (!(limit == rhs.limit))
- return false;
- if (!(offset == rhs.offset))
- return false;
- return true;
- }
- bool operator != (const Airavata_searchExperimentsByName_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_searchExperimentsByName_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_searchExperimentsByName_pargs {
- public:
-
-
- virtual ~Airavata_searchExperimentsByName_pargs() throw();
- 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;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-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_searchExperimentsByName_result__isset;
-
-class Airavata_searchExperimentsByName_result {
- public:
-
- Airavata_searchExperimentsByName_result(const Airavata_searchExperimentsByName_result&);
- Airavata_searchExperimentsByName_result& operator=(const Airavata_searchExperimentsByName_result&);
- Airavata_searchExperimentsByName_result() {
+ Airavata_getProject_result() {
}
- virtual ~Airavata_searchExperimentsByName_result() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
+ virtual ~Airavata_getProject_result() throw();
+ ::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::ProjectNotFoundException pnfe;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_searchExperimentsByName_result__isset __isset;
+ _Airavata_getProject_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
+ void __set_success(const ::apache::airavata::model::workspace::Project& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7185,9 +6224,11 @@ class Airavata_searchExperimentsByName_result {
void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+ void __set_pnfe(const ::apache::airavata::api::error::ProjectNotFoundException& val);
+
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchExperimentsByName_result & rhs) const
+ bool operator == (const Airavata_getProject_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -7197,97 +6238,81 @@ class Airavata_searchExperimentsByName_result {
return false;
if (!(ase == rhs.ase))
return false;
+ if (!(pnfe == rhs.pnfe))
+ return false;
if (!(ae == rhs.ae))
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByName_result &rhs) const {
+ bool operator != (const Airavata_getProject_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByName_result & ) const;
+ bool operator < (const Airavata_getProject_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_searchExperimentsByName_presult__isset {
- _Airavata_searchExperimentsByName_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getProject_presult__isset {
+ _Airavata_getProject_presult__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
+ bool pnfe :1;
bool ae :1;
-} _Airavata_searchExperimentsByName_presult__isset;
+} _Airavata_getProject_presult__isset;
-class Airavata_searchExperimentsByName_presult {
+class Airavata_getProject_presult {
public:
- virtual ~Airavata_searchExperimentsByName_presult() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
+ virtual ~Airavata_getProject_presult() throw();
+ ::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::ProjectNotFoundException pnfe;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_searchExperimentsByName_presult__isset __isset;
+ _Airavata_getProject_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
};
-class Airavata_searchExperimentsByDesc_args {
+class Airavata_deleteProject_args {
public:
- 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) {
+ Airavata_deleteProject_args(const Airavata_deleteProject_args&);
+ Airavata_deleteProject_args& operator=(const Airavata_deleteProject_args&);
+ Airavata_deleteProject_args() : projectId() {
}
- virtual ~Airavata_searchExperimentsByDesc_args() throw();
+ virtual ~Airavata_deleteProject_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
- std::string gatewayId;
- std::string userName;
- std::string description;
- int32_t limit;
- int32_t offset;
+ std::string projectId;
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_description(const std::string& val);
-
- void __set_limit(const int32_t val);
-
- void __set_offset(const int32_t val);
+ void __set_projectId(const std::string& val);
- bool operator == (const Airavata_searchExperimentsByDesc_args & rhs) const
+ bool operator == (const Airavata_deleteProject_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))
+ if (!(projectId == rhs.projectId))
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByDesc_args &rhs) const {
+ bool operator != (const Airavata_deleteProject_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByDesc_args & ) const;
+ bool operator < (const Airavata_deleteProject_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -7295,49 +6320,47 @@ class Airavata_searchExperimentsByDesc_args {
};
-class Airavata_searchExperimentsByDesc_pargs {
+class Airavata_deleteProject_pargs {
public:
- virtual ~Airavata_searchExperimentsByDesc_pargs() throw();
+ virtual ~Airavata_deleteProject_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;
+ const std::string* projectId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_searchExperimentsByDesc_result__isset {
- _Airavata_searchExperimentsByDesc_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_deleteProject_result__isset {
+ _Airavata_deleteProject_result__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
+ bool pnfe :1;
bool ae :1;
-} _Airavata_searchExperimentsByDesc_result__isset;
+} _Airavata_deleteProject_result__isset;
-class Airavata_searchExperimentsByDesc_result {
+class Airavata_deleteProject_result {
public:
- Airavata_searchExperimentsByDesc_result(const Airavata_searchExperimentsByDesc_result&);
- Airavata_searchExperimentsByDesc_result& operator=(const Airavata_searchExperimentsByDesc_result&);
- Airavata_searchExperimentsByDesc_result() {
+ Airavata_deleteProject_result(const Airavata_deleteProject_result&);
+ Airavata_deleteProject_result& operator=(const Airavata_deleteProject_result&);
+ Airavata_deleteProject_result() : success(0) {
}
- virtual ~Airavata_searchExperimentsByDesc_result() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
+ virtual ~Airavata_deleteProject_result() throw();
+ bool success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::ProjectNotFoundException pnfe;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_searchExperimentsByDesc_result__isset __isset;
+ _Airavata_deleteProject_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
+ void __set_success(const bool val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7345,9 +6368,11 @@ class Airavata_searchExperimentsByDesc_result {
void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
+ void __set_pnfe(const ::apache::airavata::api::error::ProjectNotFoundException& val);
+
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchExperimentsByDesc_result & rhs) const
+ bool operator == (const Airavata_deleteProject_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -7357,61 +6382,64 @@ class Airavata_searchExperimentsByDesc_result {
return false;
if (!(ase == rhs.ase))
return false;
+ if (!(pnfe == rhs.pnfe))
+ return false;
if (!(ae == rhs.ae))
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByDesc_result &rhs) const {
+ bool operator != (const Airavata_deleteProject_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByDesc_result & ) const;
+ bool operator < (const Airavata_deleteProject_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
};
-typedef struct _Airavata_searchExperimentsByDesc_presult__isset {
- _Airavata_searchExperimentsByDesc_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_deleteProject_presult__isset {
+ _Airavata_deleteProject_presult__isset() : success(false), ire(false), ace(false), ase(false), pnfe(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
+ bool pnfe :1;
bool ae :1;
-} _Airavata_searchExperimentsByDesc_presult__isset;
+} _Airavata_deleteProject_presult__isset;
-class Airavata_searchExperimentsByDesc_presult {
+class Airavata_deleteProject_presult {
public:
- virtual ~Airavata_searchExperimentsByDesc_presult() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
+ virtual ~Airavata_deleteProject_presult() throw();
+ bool* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::ProjectNotFoundException pnfe;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_searchExperimentsByDesc_presult__isset __isset;
+ _Airavata_deleteProject_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
};
-class Airavata_searchExperimentsByApplication_args {
+class Airavata_getUserProjects_args {
public:
- 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) {
+ 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_searchExperimentsByApplication_args() throw();
+ virtual ~Airavata_getUserProjects_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- std::string applicationId;
int32_t limit;
int32_t offset;
@@ -7421,13 +6449,11 @@ class Airavata_searchExperimentsByApplication_args {
void __set_userName(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_searchExperimentsByApplication_args & rhs) const
+ bool operator == (const Airavata_getUserProjects_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -7435,19 +6461,17 @@ class Airavata_searchExperimentsByApplication_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(applicationId == rhs.applicationId))
- return false;
if (!(limit == rhs.limit))
return false;
if (!(offset == rhs.offset))
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByApplication_args &rhs) const {
+ bool operator != (const Airavata_getUserProjects_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByApplication_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;
@@ -7455,15 +6479,14 @@ class Airavata_searchExperimentsByApplication_args {
};
-class Airavata_searchExperimentsByApplication_pargs {
+class Airavata_getUserProjects_pargs {
public:
- virtual ~Airavata_searchExperimentsByApplication_pargs() throw();
+ virtual ~Airavata_getUserProjects_pargs() throw();
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;
@@ -7471,33 +6494,33 @@ class Airavata_searchExperimentsByApplication_pargs {
};
-typedef struct _Airavata_searchExperimentsByApplication_result__isset {
- _Airavata_searchExperimentsByApplication_result__isset() : success(false), ire(false), ace(false), ase(false), ae(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;
bool ae :1;
-} _Airavata_searchExperimentsByApplication_result__isset;
+} _Airavata_getUserProjects_result__isset;
-class Airavata_searchExperimentsByApplication_result {
+class Airavata_getUserProjects_result {
public:
- Airavata_searchExperimentsByApplication_result(const Airavata_searchExperimentsByApplication_result&);
- Airavata_searchExperimentsByApplication_result& operator=(const Airavata_searchExperimentsByApplication_result&);
- Airavata_searchExperimentsByApplication_result() {
+ Airavata_getUserProjects_result(const Airavata_getUserProjects_result&);
+ Airavata_getUserProjects_result& operator=(const Airavata_getUserProjects_result&);
+ Airavata_getUserProjects_result() {
}
- virtual ~Airavata_searchExperimentsByApplication_result() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
+ 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_searchExperimentsByApplication_result__isset __isset;
+ _Airavata_getUserProjects_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7507,7 +6530,7 @@ class Airavata_searchExperimentsByApplication_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchExperimentsByApplication_result & rhs) const
+ bool operator == (const Airavata_getUserProjects_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -7521,57 +6544,57 @@ class Airavata_searchExperimentsByApplication_result {
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByApplication_result &rhs) const {
+ bool operator != (const Airavata_getUserProjects_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByApplication_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;
};
-typedef struct _Airavata_searchExperimentsByApplication_presult__isset {
- _Airavata_searchExperimentsByApplication_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(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;
bool ae :1;
-} _Airavata_searchExperimentsByApplication_presult__isset;
+} _Airavata_getUserProjects_presult__isset;
-class Airavata_searchExperimentsByApplication_presult {
+class Airavata_getUserProjects_presult {
public:
- virtual ~Airavata_searchExperimentsByApplication_presult() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
+ 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_searchExperimentsByApplication_presult__isset __isset;
+ _Airavata_getUserProjects_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
};
-class Airavata_searchExperimentsByStatus_args {
+class Airavata_searchProjectsByProjectName_args {
public:
- 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) {
+ 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_searchExperimentsByStatus_args() throw();
+ virtual ~Airavata_searchProjectsByProjectName_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- ::apache::airavata::model::status::ExperimentState::type experimentState;
+ std::string projectName;
int32_t limit;
int32_t offset;
@@ -7581,13 +6604,13 @@ class Airavata_searchExperimentsByStatus_args {
void __set_userName(const std::string& val);
- void __set_experimentState(const ::apache::airavata::model::status::ExperimentState::type 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_searchExperimentsByStatus_args & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectName_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -7595,7 +6618,7 @@ class Airavata_searchExperimentsByStatus_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(experimentState == rhs.experimentState))
+ if (!(projectName == rhs.projectName))
return false;
if (!(limit == rhs.limit))
return false;
@@ -7603,11 +6626,11 @@ class Airavata_searchExperimentsByStatus_args {
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByStatus_args &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectName_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByStatus_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;
@@ -7615,15 +6638,15 @@ class Airavata_searchExperimentsByStatus_args {
};
-class Airavata_searchExperimentsByStatus_pargs {
+class Airavata_searchProjectsByProjectName_pargs {
public:
- virtual ~Airavata_searchExperimentsByStatus_pargs() throw();
+ virtual ~Airavata_searchProjectsByProjectName_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const ::apache::airavata::model::status::ExperimentState::type* experimentState;
+ const std::string* projectName;
const int32_t* limit;
const int32_t* offset;
@@ -7631,33 +6654,33 @@ class Airavata_searchExperimentsByStatus_pargs {
};
-typedef struct _Airavata_searchExperimentsByStatus_result__isset {
- _Airavata_searchExperimentsByStatus_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_searchExperimentsByStatus_result__isset;
+} _Airavata_searchProjectsByProjectName_result__isset;
-class Airavata_searchExperimentsByStatus_result {
+class Airavata_searchProjectsByProjectName_result {
public:
- Airavata_searchExperimentsByStatus_result(const Airavata_searchExperimentsByStatus_result&);
- Airavata_searchExperimentsByStatus_result& operator=(const Airavata_searchExperimentsByStatus_result&);
- Airavata_searchExperimentsByStatus_result() {
+ Airavata_searchProjectsByProjectName_result(const Airavata_searchProjectsByProjectName_result&);
+ Airavata_searchProjectsByProjectName_result& operator=(const Airavata_searchProjectsByProjectName_result&);
+ Airavata_searchProjectsByProjectName_result() {
}
- virtual ~Airavata_searchExperimentsByStatus_result() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
+ 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_searchExperimentsByStatus_result__isset __isset;
+ _Airavata_searchProjectsByProjectName_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7667,7 +6690,7 @@ class Airavata_searchExperimentsByStatus_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchExperimentsByStatus_result & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectName_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -7681,58 +6704,57 @@ class Airavata_searchExperimentsByStatus_result {
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByStatus_result &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectName_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByStatus_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;
};
-typedef struct _Airavata_searchExperimentsByStatus_presult__isset {
- _Airavata_searchExperimentsByStatus_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_searchExperimentsByStatus_presult__isset;
+} _Airavata_searchProjectsByProjectName_presult__isset;
-class Airavata_searchExperimentsByStatus_presult {
+class Airavata_searchProjectsByProjectName_presult {
public:
- virtual ~Airavata_searchExperimentsByStatus_presult() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
+ 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_searchExperimentsByStatus_presult__isset __isset;
+ _Airavata_searchProjectsByProjectName_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
};
-class Airavata_searchExperimentsByCreationTime_args {
+class Airavata_searchProjectsByProjectDesc_args {
public:
- Airavata_searchExperimentsByCreationTime_args(const Airavata_searchExperimentsByCreationTime_args&);
- Airavata_searchExperimentsByCreationTime_args& operator=(const Airavata_searchExperimentsByCreationTime_args&);
- Airavata_searchExperimentsByCreationTime_args() : gatewayId(), userName(), fromTime(0), toTime(0), limit(0), offset(0) {
+ 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_searchExperimentsByCreationTime_args() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayId;
std::string userName;
- int64_t fromTime;
- int64_t toTime;
+ std::string description;
int32_t limit;
int32_t offset;
@@ -7742,15 +6764,13 @@ class Airavata_searchExperimentsByCreationTime_args {
void __set_userName(const std::string& val);
- void __set_fromTime(const int64_t val);
-
- void __set_toTime(const int64_t val);
+ void __set_description(const std::string& val);
void __set_limit(const int32_t val);
void __set_offset(const int32_t val);
- bool operator == (const Airavata_searchExperimentsByCreationTime_args & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectDesc_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -7758,9 +6778,7 @@ class Airavata_searchExperimentsByCreationTime_args {
return false;
if (!(userName == rhs.userName))
return false;
- if (!(fromTime == rhs.fromTime))
- return false;
- if (!(toTime == rhs.toTime))
+ if (!(description == rhs.description))
return false;
if (!(limit == rhs.limit))
return false;
@@ -7768,11 +6786,11 @@ class Airavata_searchExperimentsByCreationTime_args {
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByCreationTime_args &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectDesc_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByCreationTime_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;
@@ -7780,16 +6798,15 @@ class Airavata_searchExperimentsByCreationTime_args {
};
-class Airavata_searchExperimentsByCreationTime_pargs {
+class Airavata_searchProjectsByProjectDesc_pargs {
public:
- virtual ~Airavata_searchExperimentsByCreationTime_pargs() throw();
+ virtual ~Airavata_searchProjectsByProjectDesc_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayId;
const std::string* userName;
- const int64_t* fromTime;
- const int64_t* toTime;
+ const std::string* description;
const int32_t* limit;
const int32_t* offset;
@@ -7797,33 +6814,33 @@ class Airavata_searchExperimentsByCreationTime_pargs {
};
-typedef struct _Airavata_searchExperimentsByCreationTime_result__isset {
- _Airavata_searchExperimentsByCreationTime_result__isset() : success(false), ire(false), ace(false), ase(false), ae(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;
bool ae :1;
-} _Airavata_searchExperimentsByCreationTime_result__isset;
+} _Airavata_searchProjectsByProjectDesc_result__isset;
-class Airavata_searchExperimentsByCreationTime_result {
+class Airavata_searchProjectsByProjectDesc_result {
public:
- Airavata_searchExperimentsByCreationTime_result(const Airavata_searchExperimentsByCreationTime_result&);
- Airavata_searchExperimentsByCreationTime_result& operator=(const Airavata_searchExperimentsByCreationTime_result&);
- Airavata_searchExperimentsByCreationTime_result() {
+ Airavata_searchProjectsByProjectDesc_result(const Airavata_searchProjectsByProjectDesc_result&);
+ Airavata_searchProjectsByProjectDesc_result& operator=(const Airavata_searchProjectsByProjectDesc_result&);
+ Airavata_searchProjectsByProjectDesc_result() {
}
- virtual ~Airavata_searchExperimentsByCreationTime_result() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
+ 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_searchExperimentsByCreationTime_result__isset __isset;
+ _Airavata_searchProjectsByProjectDesc_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::workspace::Project> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7833,7 +6850,7 @@ class Airavata_searchExperimentsByCreationTime_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_searchExperimentsByCreationTime_result & rhs) const
+ bool operator == (const Airavata_searchProjectsByProjectDesc_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -7847,38 +6864,38 @@ class Airavata_searchExperimentsByCreationTime_result {
return false;
return true;
}
- bool operator != (const Airavata_searchExperimentsByCreationTime_result &rhs) const {
+ bool operator != (const Airavata_searchProjectsByProjectDesc_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_searchExperimentsByCreationTime_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;
};
-typedef struct _Airavata_searchExperimentsByCreationTime_presult__isset {
- _Airavata_searchExperimentsByCreationTime_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(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;
bool ae :1;
-} _Airavata_searchExperimentsByCreationTime_presult__isset;
+} _Airavata_searchProjectsByProjectDesc_presult__isset;
-class Airavata_searchExperimentsByCreationTime_presult {
+class Airavata_searchProjectsByProjectDesc_presult {
public:
- virtual ~Airavata_searchExperimentsByCreationTime_presult() throw();
- std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
+ 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_searchExperimentsByCreationTime_presult__isset __isset;
+ _Airavata_searchProjectsByProjectDesc_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
@@ -23987,21 +23004,6 @@ class AiravataClient : virtual public AiravataIf {
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);
void send_searchProjectsByProjectDesc(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 recv_searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return);
- 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);
- void send_searchExperimentsByName(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);
- void recv_searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
- 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);
- void send_searchExperimentsByDesc(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 recv_searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
- 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);
- void send_searchExperimentsByApplication(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 recv_searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
- 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);
- void send_searchExperimentsByStatus(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 recv_searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
- 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);
- void send_searchExperimentsByCreationTime(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 recv_searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _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);
void send_searchExperiments(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);
void recv_searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return);
@@ -24387,11 +23389,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getUserProjects(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_searchProjectsByProjectName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_searchProjectsByProjectDesc(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchExperimentsByName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchExperimentsByDesc(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchExperimentsByApplication(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchExperimentsByStatus(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_searchExperimentsByCreationTime(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_searchExperiments(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getExperimentStatistics(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getExperimentsInProject(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -24537,11 +23534,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getUserProjects"] = &AiravataProcessor::process_getUserProjects;
processMap_["searchProjectsByProjectName"] = &AiravataProcessor::process_searchProjectsByProjectName;
processMap_["searchProjectsByProjectDesc"] = &AiravataProcessor::process_searchProjectsByProjectDesc;
- processMap_["searchExperimentsByName"] = &AiravataProcessor::process_searchExperimentsByName;
- processMap_["searchExperimentsByDesc"] = &AiravataProcessor::process_searchExperimentsByDesc;
- processMap_["searchExperimentsByApplication"] = &AiravataProcessor::process_searchExperimentsByApplication;
- processMap_["searchExperimentsByStatus"] = &AiravataProcessor::process_searchExperimentsByStatus;
- processMap_["searchExperimentsByCreationTime"] = &AiravataProcessor::process_searchExperimentsByCreationTime;
processMap_["searchExperiments"] = &AiravataProcessor::process_searchExperiments;
processMap_["getExperimentStatistics"] = &AiravataProcessor::process_getExperimentStatistics;
processMap_["getExperimentsInProject"] = &AiravataProcessor::process_getExperimentsInProject;
@@ -24954,56 +23946,6 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchExperimentsByName(_return, authzToken, gatewayId, userName, expName, limit, offset);
- }
- ifaces_[i]->searchExperimentsByName(_return, authzToken, gatewayId, userName, expName, limit, offset);
- return;
- }
-
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchExperimentsByDesc(_return, authzToken, gatewayId, userName, description, limit, offset);
- }
- ifaces_[i]->searchExperimentsByDesc(_return, authzToken, gatewayId, userName, description, limit, offset);
- return;
- }
-
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchExperimentsByApplication(_return, authzToken, gatewayId, userName, applicationId, limit, offset);
- }
- ifaces_[i]->searchExperimentsByApplication(_return, authzToken, gatewayId, userName, applicationId, limit, offset);
- return;
- }
-
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchExperimentsByStatus(_return, authzToken, gatewayId, userName, experimentState, limit, offset);
- }
- ifaces_[i]->searchExperimentsByStatus(_return, authzToken, gatewayId, userName, experimentState, limit, offset);
- return;
- }
-
- 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) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->searchExperimentsByCreationTime(_return, authzToken, gatewayId, userName, fromTime, toTime, limit, offset);
- }
- ifaces_[i]->searchExperimentsByCreationTime(_return, authzToken, gatewayId, userName, fromTime, toTime, limit, 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) {
size_t sz = ifaces_.size();
size_t i = 0;
@@ -26213,21 +25155,6 @@ class AiravataConcurrentClient : virtual public AiravataIf {
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);
int32_t send_searchProjectsByProjectDesc(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 recv_searchProjectsByProjectDesc(std::vector< ::apache::airavata::model::workspace::Project> & _return, const int32_t seqid);
- 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);
- int32_t send_searchExperimentsByName(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);
- void recv_searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
- 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);
- int32_t send_searchExperimentsByDesc(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 recv_searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
- 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);
- int32_t send_searchExperimentsByApplication(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 recv_searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
- 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);
- int32_t send_searchExperimentsByStatus(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 recv_searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
- 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);
- int32_t send_searchExperimentsByCreationTime(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 recv_searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
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);
int32_t send_searchExperiments(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);
void recv_searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const int32_t seqid);
[24/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 c45d6fd..91a2fc6 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
@@ -422,66 +422,36 @@ public class Airavata {
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;
/**
- *
- * Search User Projects by Project Name
- * Get all Project for user by project name with pagination.Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique 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.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param projectName
- * @param limit
- * @param offset
- */
- 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 User Projects by Project Description
- * Search and get all Projects for user by project description with pagination. Results will be ordered based on creation time DESC.
- *
- * @param gatewayId
- * The unique identifier of the gateway making the request.
- *
- * @param userName
- * The identifier of the user.
- *
- * @param description
- * The description to be matched.
- *
- * @param limit
- * The amount results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
+ * *
+ * * Search User Projects
+ * * Search and get all Projects for user by project description or/and project name with pagination.
+ * * Results will be ordered based on creation time DESC.
+ * *
+ * * @param gatewayId
+ * * The unique identifier of the gateway making the request.
+ * *
+ * * @param userName
+ * * The identifier of the user.
+ * *
+ * * @param filters
+ * * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ * *
+ * * @param limit
+ * * The amount results to be fetched.
+ * *
+ * * @param offset
+ * * The starting point of the results to be fetched.
+ * *
+ * *
*
* @param authzToken
* @param gatewayId
* @param userName
- * @param description
+ * @param filters
* @param limit
* @param offset
*/
- 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;
+ public List<org.apache.airavata.model.workspace.Project> searchProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,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;
/**
* Search Experiments.
@@ -2595,9 +2565,7 @@ public class Airavata {
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 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 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 searchProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,String> filters, 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;
@@ -3782,68 +3750,28 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserProjects failed: unknown result");
}
- 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
+ public List<org.apache.airavata.model.workspace.Project> searchProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,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_searchProjectsByProjectName(authzToken, gatewayId, userName, projectName, limit, offset);
- return recv_searchProjectsByProjectName();
+ send_searchProjects(authzToken, gatewayId, userName, filters, limit, offset);
+ return recv_searchProjects();
}
- 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
+ public void send_searchProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,String> filters, int limit, int offset) throws org.apache.thrift.TException
{
- searchProjectsByProjectName_args args = new searchProjectsByProjectName_args();
+ searchProjects_args args = new searchProjects_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setProjectName(projectName);
- args.setLimit(limit);
- args.setOffset(offset);
- sendBase("searchProjectsByProjectName", 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
- receiveBase(result, "searchProjectsByProjectName");
- 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, "searchProjectsByProjectName failed: unknown result");
- }
-
- 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_searchProjectsByProjectDesc(authzToken, gatewayId, userName, description, limit, offset);
- return recv_searchProjectsByProjectDesc();
- }
-
- 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
- {
- searchProjectsByProjectDesc_args args = new searchProjectsByProjectDesc_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setDescription(description);
+ args.setFilters(filters);
args.setLimit(limit);
args.setOffset(offset);
- sendBase("searchProjectsByProjectDesc", args);
+ sendBase("searchProjects", 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.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.workspace.Project> recv_searchProjects() 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");
+ searchProjects_result result = new searchProjects_result();
+ receiveBase(result, "searchProjects");
if (result.isSetSuccess()) {
return result.success;
}
@@ -3859,7 +3787,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "searchProjects 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
@@ -9016,84 +8944,37 @@ public class Airavata {
}
}
- 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 {
- checkReady();
- searchProjectsByProjectName_call method_call = new searchProjectsByProjectName_call(authzToken, gatewayId, userName, projectName, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class searchProjectsByProjectName_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String gatewayId;
- private String userName;
- private String projectName;
- private int limit;
- private int offset;
- public searchProjectsByProjectName_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String projectName, int limit, int offset, 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;
- this.projectName = projectName;
- this.limit = limit;
- this.offset = offset;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchProjectsByProjectName", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchProjectsByProjectName_args args = new searchProjectsByProjectName_args();
- args.setAuthzToken(authzToken);
- args.setGatewayId(gatewayId);
- args.setUserName(userName);
- args.setProjectName(projectName);
- args.setLimit(limit);
- args.setOffset(offset);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.workspace.Project> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchProjectsByProjectName();
- }
- }
-
- 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 searchProjects(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,String> filters, int limit, int offset, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- searchProjectsByProjectDesc_call method_call = new searchProjectsByProjectDesc_call(authzToken, gatewayId, userName, description, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
+ searchProjects_call method_call = new searchProjects_call(authzToken, gatewayId, userName, filters, limit, offset, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class searchProjectsByProjectDesc_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class searchProjects_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayId;
private String userName;
- private String description;
+ private Map<org.apache.airavata.model.experiment.ProjectSearchFields,String> filters;
private int limit;
private int offset;
- public searchProjectsByProjectDesc_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, String description, int limit, int offset, 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 searchProjects_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, String userName, Map<org.apache.airavata.model.experiment.ProjectSearchFields,String> filters, int limit, int offset, 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;
- this.description = description;
+ this.filters = filters;
this.limit = limit;
this.offset = offset;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchProjectsByProjectDesc", org.apache.thrift.protocol.TMessageType.CALL, 0));
- searchProjectsByProjectDesc_args args = new searchProjectsByProjectDesc_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("searchProjects", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ searchProjects_args args = new searchProjects_args();
args.setAuthzToken(authzToken);
args.setGatewayId(gatewayId);
args.setUserName(userName);
- args.setDescription(description);
+ args.setFilters(filters);
args.setLimit(limit);
args.setOffset(offset);
args.write(prot);
@@ -9106,7 +8987,7 @@ public class Airavata {
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_searchProjectsByProjectDesc();
+ return (new Client(prot)).recv_searchProjects();
}
}
@@ -13370,8 +13251,7 @@ public class Airavata {
processMap.put("getProject", new getProject());
processMap.put("deleteProject", new deleteProject());
processMap.put("getUserProjects", new getUserProjects());
- processMap.put("searchProjectsByProjectName", new searchProjectsByProjectName());
- processMap.put("searchProjectsByProjectDesc", new searchProjectsByProjectDesc());
+ processMap.put("searchProjects", new searchProjects());
processMap.put("searchExperiments", new searchExperiments());
processMap.put("getExperimentStatistics", new getExperimentStatistics());
processMap.put("getExperimentsInProject", new getExperimentsInProject());
@@ -14269,53 +14149,23 @@ public class Airavata {
}
}
- public static class searchProjectsByProjectName<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchProjectsByProjectName_args> {
- public searchProjectsByProjectName() {
- super("searchProjectsByProjectName");
+ public static class searchProjects<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchProjects_args> {
+ public searchProjects() {
+ super("searchProjects");
}
- public searchProjectsByProjectName_args getEmptyArgsInstance() {
- return new searchProjectsByProjectName_args();
+ public searchProjects_args getEmptyArgsInstance() {
+ return new searchProjects_args();
}
protected boolean isOneway() {
return false;
}
- public searchProjectsByProjectName_result getResult(I iface, searchProjectsByProjectName_args args) throws org.apache.thrift.TException {
- searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
+ public searchProjects_result getResult(I iface, searchProjects_args args) throws org.apache.thrift.TException {
+ searchProjects_result result = new searchProjects_result();
try {
- result.success = iface.searchProjectsByProjectName(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class searchProjectsByProjectDesc<I extends Iface> extends org.apache.thrift.ProcessFunction<I, searchProjectsByProjectDesc_args> {
- public searchProjectsByProjectDesc() {
- super("searchProjectsByProjectDesc");
- }
-
- public searchProjectsByProjectDesc_args getEmptyArgsInstance() {
- return new searchProjectsByProjectDesc_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public searchProjectsByProjectDesc_result getResult(I iface, searchProjectsByProjectDesc_args args) throws org.apache.thrift.TException {
- searchProjectsByProjectDesc_result result = new searchProjectsByProjectDesc_result();
- try {
- result.success = iface.searchProjectsByProjectDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset);
+ result.success = iface.searchProjects(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -17840,8 +17690,7 @@ public class Airavata {
processMap.put("getProject", new getProject());
processMap.put("deleteProject", new deleteProject());
processMap.put("getUserProjects", new getUserProjects());
- processMap.put("searchProjectsByProjectName", new searchProjectsByProjectName());
- processMap.put("searchProjectsByProjectDesc", new searchProjectsByProjectDesc());
+ processMap.put("searchProjects", new searchProjects());
processMap.put("searchExperiments", new searchExperiments());
processMap.put("getExperimentStatistics", new getExperimentStatistics());
processMap.put("getExperimentsInProject", new getExperimentsInProject());
@@ -19817,20 +19666,20 @@ public class Airavata {
}
}
- public static class searchProjectsByProjectName<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchProjectsByProjectName_args, List<org.apache.airavata.model.workspace.Project>> {
- public searchProjectsByProjectName() {
- super("searchProjectsByProjectName");
+ public static class searchProjects<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchProjects_args, List<org.apache.airavata.model.workspace.Project>> {
+ public searchProjects() {
+ super("searchProjects");
}
- public searchProjectsByProjectName_args getEmptyArgsInstance() {
- return new searchProjectsByProjectName_args();
+ public searchProjects_args getEmptyArgsInstance() {
+ return new searchProjects_args();
}
public AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>>() {
public void onComplete(List<org.apache.airavata.model.workspace.Project> o) {
- searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
+ searchProjects_result result = new searchProjects_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19843,7 +19692,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchProjectsByProjectName_result result = new searchProjectsByProjectName_result();
+ searchProjects_result result = new searchProjects_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19884,25 +19733,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchProjectsByProjectName_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>> resultHandler) throws TException {
- iface.searchProjectsByProjectName(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset,resultHandler);
+ public void start(I iface, searchProjects_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>> resultHandler) throws TException {
+ iface.searchProjects(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset,resultHandler);
}
}
- public static class searchProjectsByProjectDesc<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchProjectsByProjectDesc_args, List<org.apache.airavata.model.workspace.Project>> {
- public searchProjectsByProjectDesc() {
- super("searchProjectsByProjectDesc");
+ public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
+ public searchExperiments() {
+ super("searchExperiments");
}
- public searchProjectsByProjectDesc_args getEmptyArgsInstance() {
- return new searchProjectsByProjectDesc_args();
+ public searchExperiments_args getEmptyArgsInstance() {
+ return new searchExperiments_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>>() {
- public void onComplete(List<org.apache.airavata.model.workspace.Project> o) {
- searchProjectsByProjectDesc_result result = new searchProjectsByProjectDesc_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
+ public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
+ searchExperiments_result result = new searchExperiments_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19915,7 +19764,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchProjectsByProjectDesc_result result = new searchProjectsByProjectDesc_result();
+ searchExperiments_result result = new searchExperiments_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19956,25 +19805,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchProjectsByProjectDesc_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.workspace.Project>> resultHandler) throws TException {
- iface.searchProjectsByProjectDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset,resultHandler);
+ public void start(I iface, searchExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
+ iface.searchExperiments(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset,resultHandler);
}
}
- public static class searchExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, searchExperiments_args, List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> {
- public searchExperiments() {
- super("searchExperiments");
+ public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics> {
+ public getExperimentStatistics() {
+ super("getExperimentStatistics");
}
- public searchExperiments_args getEmptyArgsInstance() {
- return new searchExperiments_args();
+ public getExperimentStatistics_args getEmptyArgsInstance() {
+ return new getExperimentStatistics_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentSummaryModel> o) {
- searchExperiments_result result = new searchExperiments_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics>() {
+ public void onComplete(org.apache.airavata.model.experiment.ExperimentStatistics o) {
+ getExperimentStatistics_result result = new getExperimentStatistics_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19987,7 +19836,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- searchExperiments_result result = new searchExperiments_result();
+ getExperimentStatistics_result result = new getExperimentStatistics_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20028,25 +19877,25 @@ public class Airavata {
return false;
}
- public void start(I iface, searchExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentSummaryModel>> resultHandler) throws TException {
- iface.searchExperiments(args.authzToken, args.gatewayId, args.userName, args.filters, args.limit, args.offset,resultHandler);
+ public void start(I iface, getExperimentStatistics_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> resultHandler) throws TException {
+ iface.getExperimentStatistics(args.authzToken, args.gatewayId, args.fromTime, args.toTime,resultHandler);
}
}
- public static class getExperimentStatistics<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatistics_args, org.apache.airavata.model.experiment.ExperimentStatistics> {
- public getExperimentStatistics() {
- super("getExperimentStatistics");
+ public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public getExperimentsInProject() {
+ super("getExperimentsInProject");
}
- public getExperimentStatistics_args getEmptyArgsInstance() {
- return new getExperimentStatistics_args();
+ public getExperimentsInProject_args getEmptyArgsInstance() {
+ return new getExperimentsInProject_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics>() {
- public void onComplete(org.apache.airavata.model.experiment.ExperimentStatistics o) {
- getExperimentStatistics_result result = new getExperimentStatistics_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
+ public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
+ getExperimentsInProject_result result = new getExperimentsInProject_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20059,7 +19908,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentStatistics_result result = new getExperimentStatistics_result();
+ getExperimentsInProject_result result = new getExperimentsInProject_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20075,6 +19924,11 @@ public class Airavata {
result.setAseIsSet(true);
msg = result;
}
+ else if (e instanceof org.apache.airavata.model.error.ProjectNotFoundException) {
+ result.pnfe = (org.apache.airavata.model.error.ProjectNotFoundException) e;
+ result.setPnfeIsSet(true);
+ msg = result;
+ }
else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
@@ -20100,25 +19954,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentStatistics_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.experiment.ExperimentStatistics> resultHandler) throws TException {
- iface.getExperimentStatistics(args.authzToken, args.gatewayId, args.fromTime, args.toTime,resultHandler);
+ public void start(I iface, getExperimentsInProject_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
+ iface.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset,resultHandler);
}
}
- public static class getExperimentsInProject<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentsInProject_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
- public getExperimentsInProject() {
- super("getExperimentsInProject");
+ public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
+ public getUserExperiments() {
+ super("getUserExperiments");
}
- public getExperimentsInProject_args getEmptyArgsInstance() {
- return new getExperimentsInProject_args();
+ public getUserExperiments_args getEmptyArgsInstance() {
+ return new getUserExperiments_args();
}
public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
- getExperimentsInProject_result result = new getExperimentsInProject_result();
+ getUserExperiments_result result = new getUserExperiments_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20131,7 +19985,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentsInProject_result result = new getExperimentsInProject_result();
+ getUserExperiments_result result = new getUserExperiments_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -20147,11 +20001,6 @@ public class Airavata {
result.setAseIsSet(true);
msg = result;
}
- else if (e instanceof org.apache.airavata.model.error.ProjectNotFoundException) {
- result.pnfe = (org.apache.airavata.model.error.ProjectNotFoundException) e;
- result.setPnfeIsSet(true);
- msg = result;
- }
else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
result.setAeIsSet(true);
@@ -20177,25 +20026,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentsInProject_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
- iface.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset,resultHandler);
+ public void start(I iface, getUserExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
+ iface.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset,resultHandler);
}
}
- public static class getUserExperiments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserExperiments_args, List<org.apache.airavata.model.experiment.ExperimentModel>> {
- public getUserExperiments() {
- super("getUserExperiments");
+ public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, String> {
+ public createExperiment() {
+ super("createExperiment");
}
- public getUserExperiments_args getEmptyArgsInstance() {
- return new getUserExperiments_args();
+ public createExperiment_args getEmptyArgsInstance() {
+ return new createExperiment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>>() {
- public void onComplete(List<org.apache.airavata.model.experiment.ExperimentModel> o) {
- getUserExperiments_result result = new getUserExperiments_result();
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ createExperiment_result result = new createExperiment_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -20208,79 +20057,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getUserExperiments_result result = new getUserExperiments_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
- result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
- result.setAeIsSet(true);
- msg = result;
- }
- else
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, getUserExperiments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.experiment.ExperimentModel>> resultHandler) throws TException {
- iface.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset,resultHandler);
- }
- }
-
- public static class createExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createExperiment_args, String> {
- public createExperiment() {
- super("createExperiment");
- }
-
- public createExperiment_args getEmptyArgsInstance() {
- return new createExperiment_args();
- }
-
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- createExperiment_result result = new createExperiment_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- createExperiment_result result = new createExperiment_result();
+ createExperiment_result result = new createExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -28315,1216 +28092,42 @@ public class Airavata {
tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_args.class, metaDataMap);
- }
-
- public getAPIVersion_args() {
- }
-
- public getAPIVersion_args(
- org.apache.airavata.model.security.AuthzToken authzToken)
- {
- this();
- this.authzToken = authzToken;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public getAPIVersion_args(getAPIVersion_args other) {
- if (other.isSetAuthzToken()) {
- this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
- }
- }
-
- public getAPIVersion_args deepCopy() {
- return new getAPIVersion_args(this);
- }
-
- @Override
- public void clear() {
- this.authzToken = null;
- }
-
- public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
- return this.authzToken;
- }
-
- public getAPIVersion_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
- this.authzToken = authzToken;
- return this;
- }
-
- public void unsetAuthzToken() {
- this.authzToken = null;
- }
-
- /** Returns true if field authzToken is set (has been assigned a value) and false otherwise */
- public boolean isSetAuthzToken() {
- return this.authzToken != null;
- }
-
- public void setAuthzTokenIsSet(boolean value) {
- if (!value) {
- this.authzToken = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case AUTHZ_TOKEN:
- if (value == null) {
- unsetAuthzToken();
- } else {
- setAuthzToken((org.apache.airavata.model.security.AuthzToken)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case AUTHZ_TOKEN:
- return getAuthzToken();
-
- }
- throw new IllegalStateException();
- }
-
- /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
- public boolean isSet(_Fields field) {
- if (field == null) {
- throw new IllegalArgumentException();
- }
-
- switch (field) {
- case AUTHZ_TOKEN:
- return isSetAuthzToken();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof getAPIVersion_args)
- return this.equals((getAPIVersion_args)that);
- return false;
- }
-
- public boolean equals(getAPIVersion_args that) {
- if (that == null)
- return false;
-
- boolean this_present_authzToken = true && this.isSetAuthzToken();
- boolean that_present_authzToken = true && that.isSetAuthzToken();
- if (this_present_authzToken || that_present_authzToken) {
- if (!(this_present_authzToken && that_present_authzToken))
- return false;
- if (!this.authzToken.equals(that.authzToken))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_authzToken = true && (isSetAuthzToken());
- list.add(present_authzToken);
- if (present_authzToken)
- list.add(authzToken);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(getAPIVersion_args other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetAuthzToken()).compareTo(other.isSetAuthzToken());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAuthzToken()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authzToken, other.authzToken);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder("getAPIVersion_args(");
- boolean first = true;
-
- sb.append("authzToken:");
- if (this.authzToken == null) {
- sb.append("null");
- } else {
- sb.append(this.authzToken);
- }
- first = false;
- sb.append(")");
- return sb.toString();
- }
-
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- if (authzToken == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
- }
- // check for sub-struct validity
- if (authzToken != null) {
- authzToken.validate();
- }
- }
-
- private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
- try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
- try {
- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private static class getAPIVersion_argsStandardSchemeFactory implements SchemeFactory {
- public getAPIVersion_argsStandardScheme getScheme() {
- return new getAPIVersion_argsStandardScheme();
- }
- }
-
- private static class getAPIVersion_argsStandardScheme extends StandardScheme<getAPIVersion_args> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
- iprot.readStructBegin();
- while (true)
- {
- schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (schemeField.id) {
- case 1: // AUTHZ_TOKEN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
- struct.authzToken.read(iprot);
- struct.setAuthzTokenIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.authzToken != null) {
- oprot.writeFieldBegin(AUTHZ_TOKEN_FIELD_DESC);
- struct.authzToken.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class getAPIVersion_argsTupleSchemeFactory implements SchemeFactory {
- public getAPIVersion_argsTupleScheme getScheme() {
- return new getAPIVersion_argsTupleScheme();
- }
- }
-
- private static class getAPIVersion_argsTupleScheme extends TupleScheme<getAPIVersion_args> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- struct.authzToken.write(oprot);
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_args struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
- struct.authzToken.read(iprot);
- struct.setAuthzTokenIsSet(true);
- }
- }
-
- }
-
- public static class getAPIVersion_result implements org.apache.thrift.TBase<getAPIVersion_result, getAPIVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAPIVersion_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAPIVersion_result");
-
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
- private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
- private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new getAPIVersion_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getAPIVersion_resultTupleSchemeFactory());
- }
-
- public String success; // required
- public org.apache.airavata.model.error.InvalidRequestException ire; // required
- public org.apache.airavata.model.error.AiravataClientException ace; // required
- public org.apache.airavata.model.error.AiravataSystemException ase; // required
- public org.apache.airavata.model.error.AuthorizationException ae; // required
-
- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- SUCCESS((short)0, "success"),
- IRE((short)1, "ire"),
- ACE((short)2, "ace"),
- ASE((short)3, "ase"),
- AE((short)4, "ae");
-
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
- static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not found.
- */
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 0: // SUCCESS
- return SUCCESS;
- case 1: // IRE
- return IRE;
- case 2: // ACE
- return ACE;
- case 3: // ASE
- return ASE;
- case 4: // AE
- return AE;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- public static _Fields findByName(String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final String _fieldName;
-
- _Fields(short thriftId, String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- public short getThriftFieldId() {
- return _thriftId;
- }
-
- public String getFieldName() {
- return _fieldName;
- }
- }
-
- // isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
- static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
- tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
- tmpMap.put(_Fields.ASE, new org.apache.thrift.meta_data.FieldMetaData("ase", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
- tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAPIVersion_result.class, metaDataMap);
- }
-
- public getAPIVersion_result() {
- }
-
- public getAPIVersion_result(
- String success,
- org.apache.airavata.model.error.InvalidRequestException ire,
- org.apache.airavata.model.error.AiravataClientException ace,
- org.apache.airavata.model.error.AiravataSystemException ase,
- org.apache.airavata.model.error.AuthorizationException ae)
- {
- this();
- this.success = success;
- this.ire = ire;
- this.ace = ace;
- this.ase = ase;
- this.ae = ae;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public getAPIVersion_result(getAPIVersion_result other) {
- if (other.isSetSuccess()) {
- this.success = other.success;
- }
- if (other.isSetIre()) {
- this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
- }
- if (other.isSetAce()) {
- this.ace = new org.apache.airavata.model.error.AiravataClientException(other.ace);
- }
- if (other.isSetAse()) {
- this.ase = new org.apache.airavata.model.error.AiravataSystemException(other.ase);
- }
- if (other.isSetAe()) {
- this.ae = new org.apache.airavata.model.error.AuthorizationException(other.ae);
- }
- }
-
- public getAPIVersion_result deepCopy() {
- return new getAPIVersion_result(this);
- }
-
- @Override
- public void clear() {
- this.success = null;
- this.ire = null;
- this.ace = null;
- this.ase = null;
- this.ae = null;
- }
-
- public String getSuccess() {
- return this.success;
- }
-
- public getAPIVersion_result setSuccess(String success) {
- this.success = success;
- return this;
- }
-
- public void unsetSuccess() {
- this.success = null;
- }
-
- /** Returns true if field success is set (has been assigned a value) and false otherwise */
- public boolean isSetSuccess() {
- return this.success != null;
- }
-
- public void setSuccessIsSet(boolean value) {
- if (!value) {
- this.success = null;
- }
- }
-
- public org.apache.airavata.model.error.InvalidRequestException getIre() {
- return this.ire;
- }
-
- public getAPIVersion_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
- this.ire = ire;
- return this;
- }
-
- public void unsetIre() {
- this.ire = null;
- }
-
- /** Returns true if field ire is set (has been assigned a value) and false otherwise */
- public boolean isSetIre() {
- return this.ire != null;
- }
-
- public void setIreIsSet(boolean value) {
- if (!value) {
- this.ire = null;
- }
- }
-
- public org.apache.airavata.model.error.AiravataClientException getAce() {
- return this.ace;
- }
-
- public getAPIVersion_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
- this.ace = ace;
- return this;
- }
-
- public void unsetAce() {
- this.ace = null;
- }
-
- /** Returns true if field ace is set (has been assigned a value) and false otherwise */
- public boolean isSetAce() {
- return this.ace != null;
- }
-
- public void setAceIsSet(boolean value) {
- if (!value) {
- this.ace = null;
- }
- }
-
- public org.apache.airavata.model.error.AiravataSystemException getAse() {
- return this.ase;
- }
-
- public getAPIVersion_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
- this.ase = ase;
- return this;
- }
-
- public void unsetAse() {
- this.ase = null;
- }
-
- /** Returns true if field ase is set (has been assigned a value) and false otherwise */
- public boolean isSetAse() {
- return this.ase != null;
- }
-
- public void setAseIsSet(boolean value) {
- if (!value) {
- this.ase = null;
- }
- }
-
- public org.apache.airavata.model.error.AuthorizationException getAe() {
- return this.ae;
- }
-
- public getAPIVersion_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
- this.ae = ae;
- return this;
- }
-
- public void unsetAe() {
- this.ae = null;
- }
-
- /** Returns true if field ae is set (has been assigned a value) and false otherwise */
- public boolean isSetAe() {
- return this.ae != null;
- }
-
- public void setAeIsSet(boolean value) {
- if (!value) {
- this.ae = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case SUCCESS:
- if (value == null) {
- unsetSuccess();
- } else {
- setSuccess((String)value);
- }
- break;
-
- case IRE:
- if (value == null) {
- unsetIre();
- } else {
- setIre((org.apache.airavata.model.error.InvalidRequestException)value);
- }
- break;
-
- case ACE:
- if (value == null) {
- unsetAce();
- } else {
- setAce((org.apache.airavata.model.error.AiravataClientException)value);
- }
- break;
-
- case ASE:
- if (value == null) {
- unsetAse();
- } else {
- setAse((org.apache.airavata.model.error.AiravataSystemException)value);
- }
- break;
-
- case AE:
- if (value == null) {
- unsetAe();
- } else {
- setAe((org.apache.airavata.model.error.AuthorizationException)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case SUCCESS:
- return getSuccess();
-
- case IRE:
- return getIre();
-
- case ACE:
- return getAce();
-
- case ASE:
- return getAse();
-
- case AE:
- return getAe();
-
- }
- throw new IllegalStateException();
- }
-
- /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
- public boolean isSet(_Fields field) {
- if (field == null) {
- throw new IllegalArgumentException();
- }
-
- switch (field) {
- case SUCCESS:
- return isSetSuccess();
- case IRE:
- return isSetIre();
- case ACE:
- return isSetAce();
- case ASE:
- return isSetAse();
- case AE:
- return isSetAe();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof getAPIVersion_result)
- return this.equals((getAPIVersion_result)that);
- return false;
- }
-
- public boolean equals(getAPIVersion_result that) {
- if (that == null)
- return false;
-
- boolean this_present_success = true && this.isSetSuccess();
- boolean that_present_success = true && that.isSetSuccess();
- if (this_present_success || that_present_success) {
- if (!(this_present_success && that_present_success))
- return false;
- if (!this.success.equals(that.success))
- return false;
- }
-
- boolean this_present_ire = true && this.isSetIre();
- boolean that_present_ire = true && that.isSetIre();
- if (this_present_ire || that_present_ire) {
- if (!(this_present_ire && that_present_ire))
- return false;
- if (!this.ire.equals(that.ire))
- return false;
- }
-
- boolean this_present_ace = true && this.isSetAce();
- boolean that_present_ace = true && that.isSetAce();
- if (this_present_ace || that_present_ace) {
- if (!(this_present_ace && that_present_ace))
- return false;
- if (!this.ace.equals(that.ace))
- return false;
- }
-
- boolean this_present_ase = true && this.isSetAse();
- boolean that_present_ase = true && that.isSetAse();
- if (this_present_ase || that_present_ase) {
- if (!(this_present_ase && that_present_ase))
- return false;
- if (!this.ase.equals(that.ase))
- return false;
- }
-
- boolean this_present_ae = true && this.isSetAe();
- boolean that_present_ae = true && that.isSetAe();
- if (this_present_ae || that_present_ae) {
- if (!(this_present_ae && that_present_ae))
- return false;
- if (!this.ae.equals(that.ae))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_success = true && (isSetSuccess());
- list.add(present_success);
- if (present_success)
- list.add(success);
-
- boolean present_ire = true && (isSetIre());
- list.add(present_ire);
- if (present_ire)
- list.add(ire);
-
- boolean present_ace = true && (isSetAce());
- list.add(present_ace);
- if (present_ace)
- list.add(ace);
-
- boolean present_ase = true && (isSetAse());
- list.add(present_ase);
- if (present_ase)
- list.add(ase);
-
- boolean present_ae = true && (isSetAe());
- list.add(present_ae);
- if (present_ae)
- list.add(ae);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(getAPIVersion_result other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetSuccess()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetIre()).compareTo(other.isSetIre());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIre()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ire, other.ire);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetAce()).compareTo(other.isSetAce());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAce()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ace, other.ace);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetAse()).compareTo(other.isSetAse());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAse()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ase, other.ase);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetAe()).compareTo(other.isSetAe());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetAe()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ae, other.ae);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder("getAPIVersion_result(");
- boolean first = true;
-
- sb.append("success:");
- if (this.success == null) {
- sb.append("null");
- } else {
- sb.append(this.success);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("ire:");
- if (this.ire == null) {
- sb.append("null");
- } else {
- sb.append(this.ire);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("ace:");
- if (this.ace == null) {
- sb.append("null");
- } else {
- sb.append(this.ace);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("ase:");
- if (this.ase == null) {
- sb.append("null");
- } else {
- sb.append(this.ase);
- }
- first = false;
- if (!first) sb.append(", ");
- sb.append("ae:");
- if (this.ae == null) {
- sb.append("null");
- } else {
- sb.append(this.ae);
- }
- first = false;
- sb.append(")");
- return sb.toString();
- }
-
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- // check for sub-struct validity
- }
-
- private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
- try {
- write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
- try {
- read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (org.apache.thrift.TException te) {
- throw new java.io.IOException(te);
- }
- }
-
- private static class getAPIVersion_resultStandardSchemeFactory implements SchemeFactory {
- public getAPIVersion_resultStandardScheme getScheme() {
- return new getAPIVersion_resultStandardScheme();
- }
- }
-
- private static class getAPIVersion_resultStandardScheme extends StandardScheme<getAPIVersion_result> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, getAPIVersion_result struct) throws org.apache.thrift.TException {
- org.apache.thrift.protocol.TField schemeField;
- iprot.readStructBegin();
- while (true)
- {
- schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (schemeField.id) {
- case 0: // SUCCESS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.success = iprot.readString();
- struct.setSuccessIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 1: // IRE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
- struct.ire.read(iprot);
- struct.setIreIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // ACE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.ace = new org.apache.airavata.model.error.AiravataClientException();
- struct.ace.read(iprot);
- struct.setAceIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 3: // ASE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.ase = new org.apache.airavata.model.error.AiravataSystemException();
- struct.ase.read(iprot);
- struct.setAseIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // AE
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.ae = new org.apache.airavata.model.error.AuthorizationException();
- struct.ae.read(iprot);
- struct.setAeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, getAPIVersion_result struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.success != null) {
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeString(struct.success);
- oprot.writeFieldEnd();
- }
- if (struct.ire != null) {
- oprot.writeFieldBegin(IRE_FIELD_DESC);
- struct.ire.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.ace != null) {
- oprot.writeFieldBegin(ACE_FIELD_DESC);
- struct.ace.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.ase != null) {
- oprot.writeFieldBegin(ASE_FIELD_DESC);
- struct.ase.write(oprot);
- oprot.writeFieldEnd();
- }
- if (struct.ae != null) {
- oprot.writeFieldBegin(AE_FIELD_DESC);
- struct.ae.write(oprot);
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class getAPIVersion_resultTupleSchemeFactory implements SchemeFactory {
- public getAPIVersion_resultTupleScheme getScheme() {
- return new getAPIVersion_resultTupleScheme();
- }
- }
-
- private static class getAPIVersion_resultTupleScheme extends TupleScheme<getAPIVersion_result> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetSuccess()) {
- optionals.set(0);
- }
- if (struct.isSetIre()) {
- optionals.set(1);
- }
- if (struct.isSetAce()) {
- optionals.set(2);
- }
- if (struct.isSetAse()) {
- optionals.set(3);
- }
- if (struct.isSetAe()) {
- optionals.set(4);
- }
- oprot.writeBitSet(optionals, 5);
- if (struct.isSetSuccess()) {
- oprot.writeString(struct.success);
- }
- if (struct.isSetIre()) {
- struct.ire.write(oprot);
- }
- if (struct.isSetAce()) {
- struct.ace.write(oprot);
- }
- if (struct.isSetAse()) {
- struct.ase.write(oprot);
- }
- if (struct.isSetAe()) {
- struct.ae.write(oprot);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getAPIVersion_result struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(5);
- if (incoming.get(0)) {
- struct.success = iprot.readString();
- struct.setSuccessIsSet(true);
- }
- if (incoming.get(1)) {
- struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
- struct.ire.read(iprot);
- struct.setIreIsSet(true);
- }
- if (incoming.get(2)) {
- struct.ace = new org.apache.airavata.model.error.AiravataClientException();
- struct.ace.read(iprot);
- struct.setAceIsSet(true);
- }
- if (incoming.get(3)) {
- struct.ase = new org.apache.airavata.model.error.AiravataSystemException();
- struct.ase.read(iprot);
- struct.setAseIsSet(true);
- }
- if (incoming.get(4)) {
- struct.ae = new org.apache.airavata.model.error.AuthorizationException();
- struct.ae.read(iprot);
- struct.setAeIsSet(true);
- }
- }
- }
-
- }
-
- public static class isUserExists_args implements org.apache.thrift.TBase<isUserExists_args, isUserExists_args._Fields>, java.io.Serializable, Cloneable, Comparable<isUserExists_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isUserExists_args");
-
- private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
- private static final org.apache.thrift.protocol.TField 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 {
- schemes.put(StandardScheme.class, new isUserExists_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new isUserExists_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 {
- 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>();
-
- static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not found.
- */
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 1: // AUTHZ_TOKEN
- return AUTHZ_TOKEN;
- case 2: // GATEWAY_ID
- return GATEWAY_ID;
- case 3: // USER_NAME
- return USER_NAME;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- public static _Fields findByName(String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final String _fieldName;
-
- _Fields(short thriftId, String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- public short getThriftFieldId() {
- return _thriftId;
- }
-
- public String getFieldName() {
- return _fieldName;
- }
- }
-
- // isset id assignments
- public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
- static {
- Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
- tmpMap.put(_Fields.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,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isUserExists_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ge
<TRUNCATED>
[15/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 9e5be2e..864d0e3 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
@@ -551,183 +551,6 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
- *
- * Search User Experiments by Name
- * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user who created the experiments.
- *
- * @param expName
- * Experiment name to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param expName
- * @param limit
- * @param 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) {
- // Your implementation goes here
- printf("searchExperimentsByName\n");
- }
-
- /**
- *
- * Search By Experiment Description
- * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @param description
- * Experiment description to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param description
- * @param limit
- * @param 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("searchExperimentsByDesc\n");
- }
-
- /**
- *
- * Search Experiment By the Application
- * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @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.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param applicationId
- * @param limit
- * @param 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("searchExperimentsByApplication\n");
- }
-
- /**
- *
- * Search User Experiments by Status
- * Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user making the request.
- *
- * @param experimentState
- * Experiement state to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param experimentState
- * @param limit
- * @param offset
- */
- 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("searchExperimentsByStatus\n");
- }
-
- /**
- *
- * Search User Experiments by the Creation Time
- * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique 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.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- * @return ExperimentSummaryModel
- * List of experiments for the given search filter. Here only the Experiment summary will be returned.
- *
- *
- *
- * @param authzToken
- * @param gatewayId
- * @param userName
- * @param fromTime
- * @param toTime
- * @param limit
- * @param 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("searchExperimentsByCreationTime\n");
- }
-
- /**
* Search Experiments.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
*
[35/53] [abbrv] airavata git commit: test
Posted by sh...@apache.org.
test
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7a636a4e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7a636a4e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7a636a4e
Branch: refs/heads/master
Commit: 7a636a4e581a7752bb1b4764c37b1af727cfd6e2
Parents: ad6b525
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 18:32:00 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 18:32:00 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/api/server/handler/AiravataServerHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a636a4e/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 7310d1a..ab33786 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
@@ -900,7 +900,7 @@ public class AiravataServerHandler implements Airavata.Iface {
List<Object> allUserExperiments = experimentCatalog.search(ExperimentCatalogModelType.EXPERIMENT, temp, -1,
0, Constants.FieldConstants.ExperimentConstants.CREATION_TIME, ResultOrderType.DESC);
List<String> accessibleExpIds = new ArrayList<>();
- allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummary)e).getExperimentId()));
+ allUserExperiments.stream().forEach(e->accessibleExpIds.add(((ExperimentSummaryModel) e).getExperimentId()));
List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.EXPERIMENT,
accessibleExpIds, regFilters, limit,
[37/53] [abbrv] airavata git commit: Added new script files
Posted by sh...@apache.org.
Added new script files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b673bcd3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b673bcd3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b673bcd3
Branch: refs/heads/master
Commit: b673bcd34c3b529824ff15fb9f121c3087df81fa
Parents: aedabdb
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jun 21 17:20:04 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:32:37 2016 -0400
----------------------------------------------------------------------
.../main/resources/bin/airavata-server-start.sh | 99 ++++++++++++++++++++
.../main/resources/bin/airavata-server-stop.sh | 70 ++++++++++++++
2 files changed, 169 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b673bcd3/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
new file mode 100644
index 0000000..44adad0
--- /dev/null
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+. `dirname $0`/setenv.sh
+cd ${AIRAVATA_HOME}/bin
+LOGO_FILE="logo.txt"
+
+JAVA_OPTS=""
+AIRAVATA_COMMAND=""
+EXTRA_ARGS=""
+IS_DAEMON_MODE=false
+LOGO=true
+
+# parse command arguments
+for var in "$@"
+do
+ case ${var} in
+ -xdebug)
+ AIRAVATA_COMMAND="${AIRAVATA_COMMAND}"
+ JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
+ shift
+ ;;
+ -security)
+ JAVA_OPTS="${JAVA_OPTS} -Djava.security.manager -Djava.security.policy=${AIRAVATA_HOME}/conf/axis2.policy -Daxis2.home=${AIRAVATA_HOME}"
+ shift
+ ;;
+ api | gfac | orchestrator)
+ AIRAVATA_COMMAND="${AIRAVATA_COMMAND} ${var}"
+ shift
+ ;;
+ -d)
+ IS_DAEMON_MODE=true
+ shift
+ ;;
+ -nologo)
+ LOGO=false
+ shift
+ ;;
+ -h)
+ echo "Usage: airavata-server-start.sh [server-name/s] [command-options]"
+ echo "Server names:"
+ echo " api Start api server"
+ echo " gfac Start api server"
+ echo " orchestrator Start api server"
+
+ echo "command options:"
+ echo " -d Start server in daemon mode"
+ echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
+ echo " -nologo Do not show airavata logo"
+ echo " -xdebug Start Airavata Server under JPDA debugger"
+ echo " -security Enable Java 2 security"
+ echo " -h Display this help and exit"
+ shift
+ exit 0
+ ;;
+ *)
+ EXTRA_ARGS="${EXTRA_ARGS} ${var}"
+ shift
+ ;;
+ esac
+done
+
+#add extra argument to the
+AIRAVATA_COMMAND="${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+
+#print logo file
+if ${LOGO} ; then
+ if [ -e ${LOGO_FILE} ]
+ then
+ cat ${LOGO_FILE}
+ fi
+fi
+
+
+if ${IS_DAEMON_MODE} ; then
+ echo "Starting airavata server/s in daemon mode..."
+ nohup java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
+ org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $* > /dev/null 2>&1 &
+else
+ java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
+ org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $*
+fi
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/b673bcd3/distribution/src/main/resources/bin/airavata-server-stop.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-stop.sh b/distribution/src/main/resources/bin/airavata-server-stop.sh
new file mode 100644
index 0000000..9ef6681
--- /dev/null
+++ b/distribution/src/main/resources/bin/airavata-server-stop.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+. `dirname $0`/setenv.sh
+cd ${AIRAVATA_HOME}/bin
+
+JAVA_OPTS=""
+AIRAVATA_COMMAND=""
+FORCE=false
+
+for var in "$@"
+do
+ case ${var} in
+ -f | --force)
+ FORCE=true
+ shift
+ ;;
+ -h)
+ echo "Usage: airavata-server-stop.sh [command-options]"
+ echo "command options:"
+ echo " -f , --force Force stop all airavata servers."
+ echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
+ echo " -h Display this help and exit"
+ shift
+ exit 0
+ ;;
+ *)
+ shift
+ esac
+done
+
+if ${FORCE} ; then
+ for f in `find . -name "server-start_*"`; do
+ f_split=(${f//_/ });
+ echo "Found process file : $f"
+ echo -n " Sending kill signals to process ${f_split[1]}..."
+ out=`kill -9 ${f_split[1]} 2>&1`
+ if [ -z "$out" ]; then
+ echo "done"
+ else
+ echo "failed (REASON: $out)"
+ fi
+ echo -n " Removing process file..."
+ out=`rm ${f} 2>&1`
+ if [ -z "$out" ]; then
+ echo "done"
+ else
+ echo "failed (REASON: $out)"
+ fi
+ done
+else
+ java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
+ org.apache.airavata.server.ServerMain stop ${AIRAVATA_COMMAND} $*
+fi
[26/53] [abbrv] airavata git commit: adding missing class
Posted by sh...@apache.org.
adding missing class
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cded43e8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cded43e8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cded43e8
Branch: refs/heads/master
Commit: cded43e86b4cb97abc0a0236a52fa3bc5ff0b001
Parents: 08e9b45
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:09:12 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:09:12 2016 -0400
----------------------------------------------------------------------
.../model/experiment/ProjectSearchFields.java | 62 ++++++++++++++++++++
1 file changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cded43e8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ProjectSearchFields.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ProjectSearchFields.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ProjectSearchFields.java
new file mode 100644
index 0000000..d805c78
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ProjectSearchFields.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.model.experiment;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+public enum ProjectSearchFields implements org.apache.thrift.TEnum {
+ PROJECT_NAME(0),
+ PROJECT_DESCRIPTION(1);
+
+ private final int value;
+
+ private ProjectSearchFields(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static ProjectSearchFields findByValue(int value) {
+ switch (value) {
+ case 0:
+ return PROJECT_NAME;
+ case 1:
+ return PROJECT_DESCRIPTION;
+ default:
+ return null;
+ }
+ }
+}
[53/53] [abbrv] airavata git commit: Refinements to user model -
AIRAVATA-1016
Posted by sh...@apache.org.
Refinements to user model - AIRAVATA-1016
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/461f7ec4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/461f7ec4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/461f7ec4
Branch: refs/heads/master
Commit: 461f7ec485521834278d10e01325b976d24f55c6
Parents: 0bc5513
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 7 12:04:24 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 7 12:04:24 2016 -0400
----------------------------------------------------------------------
.../user-group-models/user_profile_model.thrift | 31 ++++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/461f7ec4/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
index b46f91d..e0c939d 100644
--- a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
@@ -166,20 +166,19 @@ struct UserProfile {
3: required string userId,
4: required list<string> emails,
5: optional string userName,
- 6: optional string gatewayId,
- 7: optional string orcidId,
- 8: optional list<string> phones,
- 9: optional string country,
- 10: optional list<string> nationality,
- 11: optional string homeOrganization,
- 12: optional string orginationAffiliation,
- 13: required string creationTime,
- 14: required string lastAccessTime,
- 15: required string validUntil,
- 16: required Status State,
- 17: optional string comments,
- 18: optional list<string> labeledURI,
- 19: optional string gpgKey,
- 20: optional string timeZone,
- 21: optional NSFDemographics nsfDemographics
+ 6: optional string orcidId,
+ 7: optional list<string> phones,
+ 8: optional string country,
+ 9: optional list<string> nationality,
+ 10: optional string homeOrganization,
+ 11: optional string orginationAffiliation,
+ 12: required string creationTime,
+ 13: required string lastAccessTime,
+ 14: required string validUntil,
+ 15: required Status State,
+ 16: optional string comments,
+ 17: optional list<string> labeledURI,
+ 18: optional string gpgKey,
+ 19: optional string timeZone,
+ 20: optional NSFDemographics nsfDemographics
}
\ No newline at end of file
[03/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 9389597..8de0958 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
@@ -27,6 +27,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' string getAPIVersion(AuthzToken authzToken)')
print(' bool isUserExists(AuthzToken authzToken, string gatewayId, string userName)')
print(' string addGateway(AuthzToken authzToken, Gateway gateway)')
+ print(' getAllUsersInGateway(AuthzToken authzToken, string gatewayId)')
print(' void updateGateway(AuthzToken authzToken, string gatewayId, Gateway updatedGateway)')
print(' Gateway getGateway(AuthzToken authzToken, string gatewayId)')
print(' bool deleteGateway(AuthzToken authzToken, string gatewayId)')
@@ -244,6 +245,12 @@ elif cmd == 'addGateway':
sys.exit(1)
pp.pprint(client.addGateway(eval(args[0]),eval(args[1]),))
+elif cmd == 'getAllUsersInGateway':
+ if len(args) != 2:
+ print('getAllUsersInGateway requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.getAllUsersInGateway(eval(args[0]),args[1],))
+
elif cmd == 'updateGateway':
if len(args) != 3:
print('updateGateway requires 3 args')
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 7c9488a..8794b23 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
@@ -66,6 +66,24 @@ class Iface:
"""
pass
+ def getAllUsersInGateway(self, authzToken, gatewayId):
+ """
+ Get all users in the gateway
+
+ @param gatewayId
+ The gateway data model.
+
+ @return users
+ list of usernames of the users in the gateway
+
+
+
+ Parameters:
+ - authzToken
+ - gatewayId
+ """
+ pass
+
def updateGateway(self, authzToken, gatewayId, updatedGateway):
"""
Update previously registered Gateway metadata.
@@ -3186,6 +3204,57 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "addGateway failed: unknown result")
+ def getAllUsersInGateway(self, authzToken, gatewayId):
+ """
+ Get all users in the gateway
+
+ @param gatewayId
+ The gateway data model.
+
+ @return users
+ list of usernames of the users in the gateway
+
+
+
+ Parameters:
+ - authzToken
+ - gatewayId
+ """
+ self.send_getAllUsersInGateway(authzToken, gatewayId)
+ return self.recv_getAllUsersInGateway()
+
+ def send_getAllUsersInGateway(self, authzToken, gatewayId):
+ self._oprot.writeMessageBegin('getAllUsersInGateway', TMessageType.CALL, self._seqid)
+ args = getAllUsersInGateway_args()
+ args.authzToken = authzToken
+ args.gatewayId = gatewayId
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_getAllUsersInGateway(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ raise x
+ result = getAllUsersInGateway_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, "getAllUsersInGateway failed: unknown result")
+
def updateGateway(self, authzToken, gatewayId, updatedGateway):
"""
Update previously registered Gateway metadata.
@@ -10988,6 +11057,7 @@ class Processor(Iface, TProcessor):
self._processMap["getAPIVersion"] = Processor.process_getAPIVersion
self._processMap["isUserExists"] = Processor.process_isUserExists
self._processMap["addGateway"] = Processor.process_addGateway
+ self._processMap["getAllUsersInGateway"] = Processor.process_getAllUsersInGateway
self._processMap["updateGateway"] = Processor.process_updateGateway
self._processMap["getGateway"] = Processor.process_getGateway
self._processMap["deleteGateway"] = Processor.process_deleteGateway
@@ -11240,6 +11310,37 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
+ def process_getAllUsersInGateway(self, seqid, iprot, oprot):
+ args = getAllUsersInGateway_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = getAllUsersInGateway_result()
+ try:
+ result.success = self._handler.getAllUsersInGateway(args.authzToken, args.gatewayId)
+ msg_type = TMessageType.REPLY
+ except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+ raise
+ except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+ msg_type = TMessageType.REPLY
+ result.ire = ire
+ except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+ msg_type = TMessageType.REPLY
+ result.ace = ace
+ except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+ msg_type = TMessageType.REPLY
+ result.ase = ase
+ except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
+ except Exception as ex:
+ msg_type = TMessageType.EXCEPTION
+ logging.exception(ex)
+ result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+ oprot.writeMessageBegin("getAllUsersInGateway", msg_type, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
def process_updateGateway(self, seqid, iprot, oprot):
args = updateGateway_args()
args.read(iprot)
@@ -16295,6 +16396,217 @@ class addGateway_result:
def __ne__(self, other):
return not (self == other)
+class getAllUsersInGateway_args:
+ """
+ Attributes:
+ - authzToken
+ - gatewayId
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'gatewayId', None, None, ), # 2
+ )
+
+ def __init__(self, authzToken=None, gatewayId=None,):
+ self.authzToken = authzToken
+ self.gatewayId = gatewayId
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.gatewayId = 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('getAllUsersInGateway_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, 2)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.authzToken is None:
+ raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.authzToken)
+ value = (value * 31) ^ hash(self.gatewayId)
+ 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 getAllUsersInGateway_result:
+ """
+ Attributes:
+ - success
+ - ire
+ - ace
+ - ase
+ - ae
+ """
+
+ thrift_spec = (
+ (0, TType.LIST, 'success', (TType.STRING,None), None, ), # 0
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
+ )
+
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+ self.success = success
+ self.ire = ire
+ self.ace = ace
+ self.ase = ase
+ self.ae = ae
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = iprot.readString()
+ self.success.append(_elem5)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ 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('getAllUsersInGateway_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRING, len(self.success))
+ for iter6 in self.success:
+ oprot.writeString(iter6)
+ oprot.writeListEnd()
+ 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.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ 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.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 updateGateway_args:
"""
Attributes:
@@ -17014,11 +17326,11 @@ class getAllGateways_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype3, _size0) = iprot.readListBegin()
- for _i4 in xrange(_size0):
- _elem5 = apache.airavata.model.workspace.ttypes.Gateway()
- _elem5.read(iprot)
- self.success.append(_elem5)
+ (_etype10, _size7) = iprot.readListBegin()
+ for _i11 in xrange(_size7):
+ _elem12 = apache.airavata.model.workspace.ttypes.Gateway()
+ _elem12.read(iprot)
+ self.success.append(_elem12)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -17059,8 +17371,8 @@ class getAllGateways_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter6 in self.success:
- iter6.write(oprot)
+ for iter13 in self.success:
+ iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -18274,11 +18586,11 @@ class getAllNotifications_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype10, _size7) = iprot.readListBegin()
- for _i11 in xrange(_size7):
- _elem12 = apache.airavata.model.workspace.ttypes.Notification()
- _elem12.read(iprot)
- self.success.append(_elem12)
+ (_etype17, _size14) = iprot.readListBegin()
+ for _i18 in xrange(_size14):
+ _elem19 = apache.airavata.model.workspace.ttypes.Notification()
+ _elem19.read(iprot)
+ self.success.append(_elem19)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -18319,8 +18631,8 @@ class getAllNotifications_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter13 in self.success:
- iter13.write(oprot)
+ for iter20 in self.success:
+ iter20.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -19140,11 +19452,11 @@ class getAllGatewaySSHPubKeys_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype15, _vtype16, _size14 ) = iprot.readMapBegin()
- for _i18 in xrange(_size14):
- _key19 = iprot.readString()
- _val20 = iprot.readString()
- self.success[_key19] = _val20
+ (_ktype22, _vtype23, _size21 ) = iprot.readMapBegin()
+ for _i25 in xrange(_size21):
+ _key26 = iprot.readString()
+ _val27 = iprot.readString()
+ self.success[_key26] = _val27
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -19179,9 +19491,9 @@ class getAllGatewaySSHPubKeys_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter21,viter22 in self.success.items():
- oprot.writeString(kiter21)
- oprot.writeString(viter22)
+ for kiter28,viter29 in self.success.items():
+ oprot.writeString(kiter28)
+ oprot.writeString(viter29)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -19339,11 +19651,11 @@ class getAllGatewayPWDCredentials_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype24, _vtype25, _size23 ) = iprot.readMapBegin()
- for _i27 in xrange(_size23):
- _key28 = iprot.readString()
- _val29 = iprot.readString()
- self.success[_key28] = _val29
+ (_ktype31, _vtype32, _size30 ) = iprot.readMapBegin()
+ for _i34 in xrange(_size30):
+ _key35 = iprot.readString()
+ _val36 = iprot.readString()
+ self.success[_key35] = _val36
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -19378,9 +19690,9 @@ class getAllGatewayPWDCredentials_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter30,viter31 in self.success.items():
- oprot.writeString(kiter30)
- oprot.writeString(viter31)
+ for kiter37,viter38 in self.success.items():
+ oprot.writeString(kiter37)
+ oprot.writeString(viter38)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -20869,11 +21181,11 @@ class getUserProjects_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype35, _size32) = iprot.readListBegin()
- for _i36 in xrange(_size32):
- _elem37 = apache.airavata.model.workspace.ttypes.Project()
- _elem37.read(iprot)
- self.success.append(_elem37)
+ (_etype42, _size39) = iprot.readListBegin()
+ for _i43 in xrange(_size39):
+ _elem44 = apache.airavata.model.workspace.ttypes.Project()
+ _elem44.read(iprot)
+ self.success.append(_elem44)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -20914,8 +21226,8 @@ class getUserProjects_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter38 in self.success:
- iter38.write(oprot)
+ for iter45 in self.success:
+ iter45.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21141,11 +21453,11 @@ class searchProjectsByProjectName_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype42, _size39) = iprot.readListBegin()
- for _i43 in xrange(_size39):
- _elem44 = apache.airavata.model.workspace.ttypes.Project()
- _elem44.read(iprot)
- self.success.append(_elem44)
+ (_etype49, _size46) = iprot.readListBegin()
+ for _i50 in xrange(_size46):
+ _elem51 = apache.airavata.model.workspace.ttypes.Project()
+ _elem51.read(iprot)
+ self.success.append(_elem51)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21186,8 +21498,8 @@ class searchProjectsByProjectName_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter45 in self.success:
- iter45.write(oprot)
+ for iter52 in self.success:
+ iter52.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21413,11 +21725,11 @@ class searchProjectsByProjectDesc_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype49, _size46) = iprot.readListBegin()
- for _i50 in xrange(_size46):
- _elem51 = apache.airavata.model.workspace.ttypes.Project()
- _elem51.read(iprot)
- self.success.append(_elem51)
+ (_etype56, _size53) = iprot.readListBegin()
+ for _i57 in xrange(_size53):
+ _elem58 = apache.airavata.model.workspace.ttypes.Project()
+ _elem58.read(iprot)
+ self.success.append(_elem58)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21458,8 +21770,8 @@ class searchProjectsByProjectDesc_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter52 in self.success:
- iter52.write(oprot)
+ for iter59 in self.success:
+ iter59.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21685,11 +21997,11 @@ class searchExperimentsByName_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype56, _size53) = iprot.readListBegin()
- for _i57 in xrange(_size53):
- _elem58 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem58.read(iprot)
- self.success.append(_elem58)
+ (_etype63, _size60) = iprot.readListBegin()
+ for _i64 in xrange(_size60):
+ _elem65 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem65.read(iprot)
+ self.success.append(_elem65)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21730,8 +22042,8 @@ class searchExperimentsByName_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter59 in self.success:
- iter59.write(oprot)
+ for iter66 in self.success:
+ iter66.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21957,11 +22269,11 @@ class searchExperimentsByDesc_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype63, _size60) = iprot.readListBegin()
- for _i64 in xrange(_size60):
- _elem65 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem65.read(iprot)
- self.success.append(_elem65)
+ (_etype70, _size67) = iprot.readListBegin()
+ for _i71 in xrange(_size67):
+ _elem72 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem72.read(iprot)
+ self.success.append(_elem72)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22002,8 +22314,8 @@ class searchExperimentsByDesc_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter66 in self.success:
- iter66.write(oprot)
+ for iter73 in self.success:
+ iter73.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22229,11 +22541,11 @@ class searchExperimentsByApplication_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype70, _size67) = iprot.readListBegin()
- for _i71 in xrange(_size67):
- _elem72 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem72.read(iprot)
- self.success.append(_elem72)
+ (_etype77, _size74) = iprot.readListBegin()
+ for _i78 in xrange(_size74):
+ _elem79 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem79.read(iprot)
+ self.success.append(_elem79)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22274,8 +22586,8 @@ class searchExperimentsByApplication_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter73 in self.success:
- iter73.write(oprot)
+ for iter80 in self.success:
+ iter80.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22501,11 +22813,11 @@ class searchExperimentsByStatus_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype77, _size74) = iprot.readListBegin()
- for _i78 in xrange(_size74):
- _elem79 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem79.read(iprot)
- self.success.append(_elem79)
+ (_etype84, _size81) = iprot.readListBegin()
+ for _i85 in xrange(_size81):
+ _elem86 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem86.read(iprot)
+ self.success.append(_elem86)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22546,8 +22858,8 @@ class searchExperimentsByStatus_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter80 in self.success:
- iter80.write(oprot)
+ for iter87 in self.success:
+ iter87.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22788,11 +23100,11 @@ class searchExperimentsByCreationTime_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype84, _size81) = iprot.readListBegin()
- for _i85 in xrange(_size81):
- _elem86 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem86.read(iprot)
- self.success.append(_elem86)
+ (_etype91, _size88) = iprot.readListBegin()
+ for _i92 in xrange(_size88):
+ _elem93 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem93.read(iprot)
+ self.success.append(_elem93)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22833,8 +23145,8 @@ class searchExperimentsByCreationTime_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter87 in self.success:
- iter87.write(oprot)
+ for iter94 in self.success:
+ iter94.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22937,11 +23249,11 @@ class searchExperiments_args:
elif fid == 4:
if ftype == TType.MAP:
self.filters = {}
- (_ktype89, _vtype90, _size88 ) = iprot.readMapBegin()
- for _i92 in xrange(_size88):
- _key93 = iprot.readI32()
- _val94 = iprot.readString()
- self.filters[_key93] = _val94
+ (_ktype96, _vtype97, _size95 ) = iprot.readMapBegin()
+ for _i99 in xrange(_size95):
+ _key100 = iprot.readI32()
+ _val101 = iprot.readString()
+ self.filters[_key100] = _val101
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -22980,9 +23292,9 @@ class searchExperiments_args:
if self.filters is not None:
oprot.writeFieldBegin('filters', TType.MAP, 4)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.filters))
- for kiter95,viter96 in self.filters.items():
- oprot.writeI32(kiter95)
- oprot.writeString(viter96)
+ for kiter102,viter103 in self.filters.items():
+ oprot.writeI32(kiter102)
+ oprot.writeString(viter103)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.limit is not None:
@@ -23068,11 +23380,11 @@ class searchExperiments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype100, _size97) = iprot.readListBegin()
- for _i101 in xrange(_size97):
- _elem102 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem102.read(iprot)
- self.success.append(_elem102)
+ (_etype107, _size104) = iprot.readListBegin()
+ for _i108 in xrange(_size104):
+ _elem109 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem109.read(iprot)
+ self.success.append(_elem109)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -23113,8 +23425,8 @@ class searchExperiments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter103 in self.success:
- iter103.write(oprot)
+ for iter110 in self.success:
+ iter110.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -23547,11 +23859,11 @@ class getExperimentsInProject_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype107, _size104) = iprot.readListBegin()
- for _i108 in xrange(_size104):
- _elem109 = apache.airavata.model.experiment.ttypes.ExperimentModel()
- _elem109.read(iprot)
- self.success.append(_elem109)
+ (_etype114, _size111) = iprot.readListBegin()
+ for _i115 in xrange(_size111):
+ _elem116 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ _elem116.read(iprot)
+ self.success.append(_elem116)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -23598,8 +23910,8 @@ class getExperimentsInProject_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter110 in self.success:
- iter110.write(oprot)
+ for iter117 in self.success:
+ iter117.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -23815,11 +24127,11 @@ class getUserExperiments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype114, _size111) = iprot.readListBegin()
- for _i115 in xrange(_size111):
- _elem116 = apache.airavata.model.experiment.ttypes.ExperimentModel()
- _elem116.read(iprot)
- self.success.append(_elem116)
+ (_etype121, _size118) = iprot.readListBegin()
+ for _i122 in xrange(_size118):
+ _elem123 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ _elem123.read(iprot)
+ self.success.append(_elem123)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -23860,8 +24172,8 @@ class getUserExperiments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter117 in self.success:
- iter117.write(oprot)
+ for iter124 in self.success:
+ iter124.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26094,11 +26406,11 @@ class getExperimentOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype121, _size118) = iprot.readListBegin()
- for _i122 in xrange(_size118):
- _elem123 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem123.read(iprot)
- self.success.append(_elem123)
+ (_etype128, _size125) = iprot.readListBegin()
+ for _i129 in xrange(_size125):
+ _elem130 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem130.read(iprot)
+ self.success.append(_elem130)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26145,8 +26457,8 @@ class getExperimentOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter124 in self.success:
- iter124.write(oprot)
+ for iter131 in self.success:
+ iter131.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26320,11 +26632,11 @@ class getIntermediateOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype128, _size125) = iprot.readListBegin()
- for _i129 in xrange(_size125):
- _elem130 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem130.read(iprot)
- self.success.append(_elem130)
+ (_etype135, _size132) = iprot.readListBegin()
+ for _i136 in xrange(_size132):
+ _elem137 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem137.read(iprot)
+ self.success.append(_elem137)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26371,8 +26683,8 @@ class getIntermediateOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter131 in self.success:
- iter131.write(oprot)
+ for iter138 in self.success:
+ iter138.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26546,12 +26858,12 @@ class getJobStatuses_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype133, _vtype134, _size132 ) = iprot.readMapBegin()
- for _i136 in xrange(_size132):
- _key137 = iprot.readString()
- _val138 = apache.airavata.model.status.ttypes.JobStatus()
- _val138.read(iprot)
- self.success[_key137] = _val138
+ (_ktype140, _vtype141, _size139 ) = iprot.readMapBegin()
+ for _i143 in xrange(_size139):
+ _key144 = iprot.readString()
+ _val145 = apache.airavata.model.status.ttypes.JobStatus()
+ _val145.read(iprot)
+ self.success[_key144] = _val145
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -26598,9 +26910,9 @@ class getJobStatuses_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
- for kiter139,viter140 in self.success.items():
- oprot.writeString(kiter139)
- viter140.write(oprot)
+ for kiter146,viter147 in self.success.items():
+ oprot.writeString(kiter146)
+ viter147.write(oprot)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26774,11 +27086,11 @@ class getJobDetails_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype144, _size141) = iprot.readListBegin()
- for _i145 in xrange(_size141):
- _elem146 = apache.airavata.model.job.ttypes.JobModel()
- _elem146.read(iprot)
- self.success.append(_elem146)
+ (_etype151, _size148) = iprot.readListBegin()
+ for _i152 in xrange(_size148):
+ _elem153 = apache.airavata.model.job.ttypes.JobModel()
+ _elem153.read(iprot)
+ self.success.append(_elem153)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26825,8 +27137,8 @@ class getJobDetails_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter147 in self.success:
- iter147.write(oprot)
+ for iter154 in self.success:
+ iter154.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -28083,11 +28395,11 @@ class getAllAppModules_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype151, _size148) = iprot.readListBegin()
- for _i152 in xrange(_size148):
- _elem153 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem153.read(iprot)
- self.success.append(_elem153)
+ (_etype158, _size155) = iprot.readListBegin()
+ for _i159 in xrange(_size155):
+ _elem160 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem160.read(iprot)
+ self.success.append(_elem160)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -28128,8 +28440,8 @@ class getAllAppModules_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter154 in self.success:
- iter154.write(oprot)
+ for iter161 in self.success:
+ iter161.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29343,11 +29655,11 @@ class getAllApplicationDeployments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype158, _size155) = iprot.readListBegin()
- for _i159 in xrange(_size155):
- _elem160 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem160.read(iprot)
- self.success.append(_elem160)
+ (_etype165, _size162) = iprot.readListBegin()
+ for _i166 in xrange(_size162):
+ _elem167 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem167.read(iprot)
+ self.success.append(_elem167)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29388,8 +29700,8 @@ class getAllApplicationDeployments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter161 in self.success:
- iter161.write(oprot)
+ for iter168 in self.success:
+ iter168.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29555,10 +29867,10 @@ class getAppModuleDeployedResources_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype165, _size162) = iprot.readListBegin()
- for _i166 in xrange(_size162):
- _elem167 = iprot.readString()
- self.success.append(_elem167)
+ (_etype172, _size169) = iprot.readListBegin()
+ for _i173 in xrange(_size169):
+ _elem174 = iprot.readString()
+ self.success.append(_elem174)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29599,8 +29911,8 @@ class getAppModuleDeployedResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter168 in self.success:
- oprot.writeString(iter168)
+ for iter175 in self.success:
+ oprot.writeString(iter175)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -30838,11 +31150,11 @@ class getAllApplicationInterfaceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype170, _vtype171, _size169 ) = iprot.readMapBegin()
- for _i173 in xrange(_size169):
- _key174 = iprot.readString()
- _val175 = iprot.readString()
- self.success[_key174] = _val175
+ (_ktype177, _vtype178, _size176 ) = iprot.readMapBegin()
+ for _i180 in xrange(_size176):
+ _key181 = iprot.readString()
+ _val182 = iprot.readString()
+ self.success[_key181] = _val182
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -30883,9 +31195,9 @@ class getAllApplicationInterfaceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter176,viter177 in self.success.items():
- oprot.writeString(kiter176)
- oprot.writeString(viter177)
+ for kiter183,viter184 in self.success.items():
+ oprot.writeString(kiter183)
+ oprot.writeString(viter184)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -31051,221 +31363,9 @@ class getAllApplicationInterfaces_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype181, _size178) = iprot.readListBegin()
- for _i182 in xrange(_size178):
- _elem183 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
- _elem183.read(iprot)
- self.success.append(_elem183)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- 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('getAllApplicationInterfaces_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter184 in self.success:
- iter184.write(oprot)
- oprot.writeListEnd()
- 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.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- 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.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 getApplicationInputs_args:
- """
- Attributes:
- - authzToken
- - appInterfaceId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appInterfaceId', None, None, ), # 2
- )
-
- def __init__(self, authzToken=None, appInterfaceId=None,):
- self.authzToken = authzToken
- self.appInterfaceId = appInterfaceId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.appInterfaceId = 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('getApplicationInputs_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.appInterfaceId is not None:
- oprot.writeFieldBegin('appInterfaceId', TType.STRING, 2)
- oprot.writeString(self.appInterfaceId)
- 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.appInterfaceId is None:
- raise TProtocol.TProtocolException(message='Required field appInterfaceId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appInterfaceId)
- 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 getApplicationInputs_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
(_etype188, _size185) = iprot.readListBegin()
for _i189 in xrange(_size185):
- _elem190 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem190 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
_elem190.read(iprot)
self.success.append(_elem190)
iprot.readListEnd()
@@ -31304,7 +31404,7 @@ class getApplicationInputs_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getApplicationInputs_result')
+ oprot.writeStructBegin('getAllApplicationInterfaces_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
@@ -31355,7 +31455,7 @@ class getApplicationInputs_result:
def __ne__(self, other):
return not (self == other)
-class getApplicationOutputs_args:
+class getApplicationInputs_args:
"""
Attributes:
- authzToken
@@ -31401,7 +31501,7 @@ class getApplicationOutputs_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getApplicationOutputs_args')
+ oprot.writeStructBegin('getApplicationInputs_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -31438,7 +31538,7 @@ class getApplicationOutputs_args:
def __ne__(self, other):
return not (self == other)
-class getApplicationOutputs_result:
+class getApplicationInputs_result:
"""
Attributes:
- success
@@ -31449,7 +31549,7 @@ class getApplicationOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -31477,7 +31577,7 @@ class getApplicationOutputs_result:
self.success = []
(_etype195, _size192) = iprot.readListBegin()
for _i196 in xrange(_size192):
- _elem197 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem197 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
_elem197.read(iprot)
self.success.append(_elem197)
iprot.readListEnd()
@@ -31516,7 +31616,7 @@ class getApplicationOutputs_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getApplicationOutputs_result')
+ oprot.writeStructBegin('getApplicationInputs_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
@@ -31567,6 +31667,218 @@ class getApplicationOutputs_result:
def __ne__(self, other):
return not (self == other)
+class getApplicationOutputs_args:
+ """
+ Attributes:
+ - authzToken
+ - appInterfaceId
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'appInterfaceId', None, None, ), # 2
+ )
+
+ def __init__(self, authzToken=None, appInterfaceId=None,):
+ self.authzToken = authzToken
+ self.appInterfaceId = appInterfaceId
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.appInterfaceId = 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('getApplicationOutputs_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
+ if self.appInterfaceId is not None:
+ oprot.writeFieldBegin('appInterfaceId', TType.STRING, 2)
+ oprot.writeString(self.appInterfaceId)
+ 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.appInterfaceId is None:
+ raise TProtocol.TProtocolException(message='Required field appInterfaceId is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.authzToken)
+ value = (value * 31) ^ hash(self.appInterfaceId)
+ 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 getApplicationOutputs_result:
+ """
+ Attributes:
+ - success
+ - ire
+ - ace
+ - ase
+ - ae
+ """
+
+ thrift_spec = (
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
+ )
+
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+ self.success = success
+ self.ire = ire
+ self.ace = ace
+ self.ase = ase
+ self.ae = ae
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype202, _size199) = iprot.readListBegin()
+ for _i203 in xrange(_size199):
+ _elem204 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem204.read(iprot)
+ self.success.append(_elem204)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ 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('getApplicationOutputs_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter205 in self.success:
+ iter205.write(oprot)
+ oprot.writeListEnd()
+ 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.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ 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.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 getAvailableAppInterfaceComputeResources_args:
"""
Attributes:
@@ -31687,11 +31999,11 @@ class getAvailableAppInterfaceComputeResources_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype200, _vtype201, _size199 ) = iprot.readMapBegin()
- for _i203 in xrange(_size199):
- _key204 = iprot.readString()
- _val205 = iprot.readString()
- self.success[_key204] = _val205
+ (_ktype207, _vtype208, _size206 ) = iprot.readMapBegin()
+ for _i210 in xrange(_size206):
+ _key211 = iprot.readString()
+ _val212 = iprot.readString()
+ self.success[_key211] = _val212
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -31732,9 +32044,9 @@ class getAvailableAppInterfaceComputeResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter206,viter207 in self.success.items():
- oprot.writeString(kiter206)
- oprot.writeString(viter207)
+ for kiter213,viter214 in self.success.items():
+ oprot.writeString(kiter213)
+ oprot.writeString(viter214)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -32293,11 +32605,11 @@ class getAllComputeResourceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype209, _vtype210, _size208 ) = iprot.readMapBegin()
- for _i212 in xrange(_size208):
- _key213 = iprot.readString()
- _val214 = iprot.readString()
- self.success[_key213] = _val214
+ (_ktype216, _vtype217, _size215 ) = iprot.readMapBegin()
+ for _i219 in xrange(_size215):
+ _key220 = iprot.readString()
+ _val221 = iprot.readString()
+ self.success[_key220] = _val221
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -32338,9 +32650,9 @@ class getAllComputeResourceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter215,viter216 in self.success.items():
- oprot.writeString(kiter215)
- oprot.writeString(viter216)
+ for kiter222,viter223 in self.success.items():
+ oprot.writeString(kiter222)
+ oprot.writeString(viter223)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -33321,11 +33633,11 @@ class getAllStorageResourceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype218, _vtype219, _size217 ) = iprot.readMapBegin()
- for _i221 in xrange(_size217):
- _key222 = iprot.readString()
- _val223 = iprot.readString()
- self.success[_key222] = _val223
+ (_ktype225, _vtype226, _size224 ) = iprot.readMapBegin()
+ for _i228 in xrange(_size224):
+ _key229 = iprot.readString()
+ _val230 = iprot.readString()
+ self.success[_key229] = _val230
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -33366,9 +33678,9 @@ class getAllStorageResourceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter224,viter225 in self.success.items():
- oprot.writeString(kiter224)
- oprot.writeString(viter225)
+ for kiter231,viter232 in self.success.items():
+ oprot.writeString(kiter231)
+ oprot.writeString(viter232)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -39857,11 +40169,11 @@ class changeJobSubmissionPriorities_args:
elif fid == 2:
if ftype == TType.MAP:
self.jobSubmissionPriorityMap = {}
- (_ktype227, _vtype228, _size226 ) = iprot.readMapBegin()
- for _i230 in xrange(_size226):
- _key231 = iprot.readString()
- _val232 = iprot.readI32()
- self.jobSubmissionPriorityMap[_key231] = _val232
+ (_ktype234, _vtype235, _size233 ) = iprot.readMapBegin()
+ for _i237 in xrange(_size233):
+ _key238 = iprot.readString()
+ _val239 = iprot.readI32()
+ self.jobSubmissionPriorityMap[_key238] = _val239
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -39882,9 +40194,9 @@ class changeJobSubmissionPriorities_args:
if self.jobSubmissionPriorityMap is not None:
oprot.writeFieldBegin('jobSubmissionPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.jobSubmissionPriorityMap))
- for kiter233,viter234 in self.jobSubmissionPriorityMap.items():
- oprot.writeString(kiter233)
- oprot.writeI32(viter234)
+ for kiter240,viter241 in self.jobSubmissionPriorityMap.items():
+ oprot.writeString(kiter240)
+ oprot.writeI32(viter241)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -40070,11 +40382,11 @@ class changeDataMovementPriorities_args:
elif fid == 2:
if ftype == TType.MAP:
self.dataMovementPriorityMap = {}
- (_ktype236, _vtype237, _size235 ) = iprot.readMapBegin()
- for _i239 in xrange(_size235):
- _key240 = iprot.readString()
- _val241 = iprot.readI32()
- self.dataMovementPriorityMap[_key240] = _val241
+ (_ktype243, _vtype244, _size242 ) = iprot.readMapBegin()
+ for _i246 in xrange(_size242):
+ _key247 = iprot.readString()
+ _val248 = iprot.readI32()
+ self.dataMovementPriorityMap[_key247] = _val248
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -40095,9 +40407,9 @@ class changeDataMovementPriorities_args:
if self.dataMovementPriorityMap is not None:
oprot.writeFieldBegin('dataMovementPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.dataMovementPriorityMap))
- for kiter242,viter243 in self.dataMovementPriorityMap.items():
- oprot.writeString(kiter242)
- oprot.writeI32(viter243)
+ for kiter249,viter250 in self.dataMovementPriorityMap.items():
+ oprot.writeString(kiter249)
+ oprot.writeI32(viter250)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -43603,11 +43915,11 @@ class getAllGatewayComputeResourcePreferences_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype247, _size244) = iprot.readListBegin()
- for _i248 in xrange(_size244):
- _elem249 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
- _elem249.read(iprot)
- self.success.append(_elem249)
+ (_etype254, _size251) = iprot.readListBegin()
+ for _i255 in xrange(_size251):
+ _elem256 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+ _elem256.read(iprot)
+ self.success.append(_elem256)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -43648,8 +43960,8 @@ class getAllGatewayComputeResourcePreferences_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter250 in self.success:
- iter250.write(oprot)
+ for iter257 in self.success:
+ iter257.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -43815,11 +44127,11 @@ class getAllGatewayStoragePreferences_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype254, _size251) = iprot.readListBegin()
- for _i255 in xrange(_size251):
- _elem256 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
- _elem256.read(iprot)
- self.success.append(_elem256)
+ (_etype261, _size258) = iprot.readListBegin()
+ for _i262 in xrange(_size258):
+ _elem263 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+ _elem263.read(iprot)
+ self.success.append(_elem263)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -43860,8 +44172,8 @@ class getAllGatewayStoragePreferences_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter257 in self.success:
- iter257.write(oprot)
+ for iter264 in self.success:
+ iter264.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -44012,11 +44324,11 @@ class getAllGatewayResourceProfiles_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype261, _size258) = iprot.readListBegin()
- for _i262 in xrange(_size258):
- _elem263 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
- _elem263.read(iprot)
- self.success.append(_elem263)
+ (_etype268, _size265) = iprot.readListBegin()
+ for _i269 in xrange(_size265):
+ _elem270 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+ _elem270.read(iprot)
+ self.success.append(_elem270)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -44057,8 +44369,8 @@ class getAllGatewayResourceProfiles_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter264 in self.success:
- iter264.write(oprot)
+ for iter271 in self.success:
+ iter271.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -45128,10 +45440,10 @@ class getAllWorkflows_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype268, _size265) = iprot.readListBegin()
- for _i269 in xrange(_size265):
- _elem270 = iprot.readString()
- self.success.append(_elem270)
+ (_etype275, _size272) = iprot.readListBegin()
+ for _i276 in xrange(_size272):
+ _elem277 = iprot.readString()
+ self.success.append(_elem277)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -45172,8 +45484,8 @@ class getAllWorkflows_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter271 in self.success:
- oprot.writeString(iter271)
+ for iter278 in self.success:
+ oprot.writeString(iter278)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -47382,11 +47694,11 @@ class getChildDataProducts_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype275, _size272) = iprot.readListBegin()
- for _i276 in xrange(_size272):
- _elem277 = apache.airavata.model.data.replica.ttypes.DataProductModel()
- _elem277.read(iprot)
- self.success.append(_elem277)
+ (_etype282, _size279) = iprot.readListBegin()
+ for _i283 in xrange(_size279):
+ _elem284 = apache.airavata.model.data.replica.ttypes.DataProductModel()
+ _elem284.read(iprot)
+ self.success.append(_elem284)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -47427,8 +47739,8 @@ class getChildDataProducts_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter278 in self.success:
- iter278.write(oprot)
+ for iter285 in self.success:
+ iter285.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index c6ecee3..900bf6d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 6921217..ce38569 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index fb21093..282ca7c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 0c1b0aa..9900063 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index cf537cc..572cd40 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 4f71797..cb119c7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 7a4f8f3..e95ee37 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/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 448280c..acb89d3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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/9dd7c14a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 6530adb..4e4db6b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 efe82b6..b6491da 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
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");
[30/53] [abbrv] airavata git commit: updating xacml policies
Posted by sh...@apache.org.
updating xacml policies
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b34d8a45
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b34d8a45
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b34d8a45
Branch: refs/heads/master
Commit: b34d8a450c37028d61bd446c1d7e1884695a3a3c
Parents: b450b85
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:21:28 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:21:28 2016 -0400
----------------------------------------------------------------------
.../resources/airavata-default-xacml-policy.xml | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b34d8a45/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
index 955436c..8fe92a7 100644
--- a/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
+++ b/modules/configuration/server/src/main/resources/airavata-default-xacml-policy.xml
@@ -58,13 +58,7 @@
/airavata/getProject|
/airavata/deleteProject|
/airavata/getUserProjects|
-/airavata/searchProjectsByProjectName|
-/airavata/searchProjectsByProjectDesc|
-/airavata/searchExperimentsByName|
-/airavata/searchExperimentsByDesc|
-/airavata/searchExperimentsByApplication|
-/airavata/searchExperimentsByStatus|
-/airavata/searchExperimentsByCreationTime|
+/airavata/searchProjects|
/airavata/searchExperiments|
/airavata/getExperimentStatistics|
/airavata/getExperimentsInProject|
@@ -132,13 +126,7 @@
/airavata/getProject|
/airavata/deleteProject|
/airavata/getUserProjects|
-/airavata/searchProjectsByProjectName|
-/airavata/searchProjectsByProjectDesc|
-/airavata/searchExperimentsByName|
-/airavata/searchExperimentsByDesc|
-/airavata/searchExperimentsByApplication|
-/airavata/searchExperimentsByStatus|
-/airavata/searchExperimentsByCreationTime|
+/airavata/searchsearchProjects|
/airavata/searchExperiments|
/airavata/getExperimentStatistics|
/airavata/getExperimentsInProject|
[41/53] [abbrv] airavata git commit: Added subset server profile to
start api-orch and execution subsets
Posted by sh...@apache.org.
Added subset server profile to start api-orch and execution subsets
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5757f124
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5757f124
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5757f124
Branch: refs/heads/master
Commit: 5757f1243260dcaf683a852217137b03bd7897bc
Parents: 31f4315
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jun 28 16:20:59 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:32:37 2016 -0400
----------------------------------------------------------------------
.../main/resources/bin/airavata-server-start.sh | 12 +++---
.../main/resources/bin/airavata-server-stop.sh | 7 ++--
.../org/apache/airavata/server/ServerMain.java | 40 ++++++++++++--------
3 files changed, 36 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5757f124/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
index a3c9a72..83383bb 100644
--- a/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -27,7 +27,8 @@ EXTRA_ARGS=""
SERVERS=""
IS_DAEMON_MODE=false
LOGO=true
-ALL_IN_ONE=false
+IS_SUBSET=false
+SUBSET=""
# parse command arguments
for var in "$@"
@@ -50,8 +51,9 @@ do
fi
shift
;;
- all)
- ALL_IN_ONE=true
+ all | api-orch | execution )
+ IS_SUBSET=true
+ SUBSET="${var}"
shift
;;
-d)
@@ -89,8 +91,8 @@ do
done
#Construct Airavata command arguments in proper order.
-if ${ALL_IN_ONE} ; then
- AIRAVATA_COMMAND="--servers=all ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
+if ${IS_SUBSET} ; then
+ AIRAVATA_COMMAND="--servers=${SUBSET} ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
else
AIRAVATA_COMMAND="--servers=${SERVERS} ${AIRAVATA_COMMAND} ${EXTRA_ARGS}"
fi
http://git-wip-us.apache.org/repos/asf/airavata/blob/5757f124/distribution/src/main/resources/bin/airavata-server-stop.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-stop.sh b/distribution/src/main/resources/bin/airavata-server-stop.sh
index 9ef6681..7f83f48 100644
--- a/distribution/src/main/resources/bin/airavata-server-stop.sh
+++ b/distribution/src/main/resources/bin/airavata-server-stop.sh
@@ -46,11 +46,12 @@ do
done
if ${FORCE} ; then
- for f in `find . -name "server-start_*"`; do
+ for f in `find . -name "server_start_*"`; do
+ # split file name using "_" underscore
f_split=(${f//_/ });
echo "Found process file : $f"
- echo -n " Sending kill signals to process ${f_split[1]}..."
- out=`kill -9 ${f_split[1]} 2>&1`
+ echo -n " Sending kill signals to process ${f_split[2]}..."
+ out=`kill -9 ${f_split[2]} 2>&1`
if [ -z "$out" ]; then
echo "done"
else
http://git-wip-us.apache.org/repos/asf/airavata/blob/5757f124/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index b1db8e1..888a33e 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -43,18 +43,20 @@ public class ServerMain {
private static final String SERVERS_KEY="servers";
private final static Logger logger = LoggerFactory.getLogger(ServerMain.class);
private static boolean serversLoaded=false;
- private static final String stopFileNamePrefix = "server-stop";
+ private static final String stopFileNamePrefix = "server_stop";
private static int serverPID=-1;
- private static final String serverStartedFileNamePrefix = "server-start";
+ private static final String serverStartedFileNamePrefix = "server_start";
private static boolean systemShutDown=false;
private static String STOP_COMMAND_STR = "stop";
- private static String ALL_IN_ONE = "all";
+ private static final String ALL_IN_ONE = "all";
+ private static final String API_ORCH = "api-orch";
+ private static final String EXECUTION = "execution";
// server names
- private static String API_SERVER = "apiserver";
- private static String CREDENTIAL_STORE = "credentialstore";
- private static String GFAC_SERVER = "gfac";
- private static String ORCHESTRATOR = "orcestrator";
+ private static final String API_SERVER = "apiserver";
+ private static final String CREDENTIAL_STORE = "credentialstore";
+ private static final String GFAC_SERVER = "gfac";
+ private static final String ORCHESTRATOR = "orcestrator";
private static ServerCnxnFactory cnxnFactory;
// private static boolean shutdownHookCalledBefore=false;
@@ -108,14 +110,22 @@ public class ServerMain {
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
- return serverList;
- }
- // credential store should start before api server
- int credPos = serverList.indexOf(CREDENTIAL_STORE);
- if (credPos > 0) { // neither absent nor credentialstore is first element
- String temp = serverList.get(0);
- serverList.set(0, serverList.get(credPos));
- serverList.set(credPos, temp);
+ } else if (serverList.indexOf(API_ORCH) > -1) {
+ serverList.clear();
+ serverList.add(CREDENTIAL_STORE);
+ serverList.add(API_SERVER);
+ serverList.add(ORCHESTRATOR);
+ } else if (serverList.indexOf(EXECUTION) > -1) {
+ serverList.clear();
+ serverList.add(GFAC_SERVER);
+ } else {
+ // credential store should start before api server
+ int credPos = serverList.indexOf(CREDENTIAL_STORE);
+ if (credPos > 0) { // neither absent nor credentialstore is first element
+ String temp = serverList.get(0);
+ serverList.set(0, serverList.get(credPos));
+ serverList.set(credPos, temp);
+ }
}
return serverList;
}
[25/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
unifying project search API methods
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/08e9b45f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/08e9b45f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/08e9b45f
Branch: refs/heads/master
Commit: 08e9b45fc2e2ae37ff105bf18c96f823264b13e5
Parents: c9ddaeb
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:06:26 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:06:26 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 119 +-
.../java/org/apache/airavata/api/Airavata.java | 12130 +++++++----------
.../main/resources/lib/airavata/Airavata.cpp | 1771 +--
.../src/main/resources/lib/airavata/Airavata.h | 349 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 81 +-
.../lib/airavata/experiment_model_types.cpp | 10 +
.../lib/airavata/experiment_model_types.h | 9 +
.../resources/lib/Airavata/API/Airavata.php | 1188 +-
.../lib/Airavata/Model/Experiment/Types.php | 9 +
.../lib/apache/airavata/api/Airavata-remote | 15 +-
.../lib/apache/airavata/api/Airavata.py | 943 +-
.../apache/airavata/model/experiment/ttypes.py | 14 +
.../airavata-apis/airavata_api.thrift | 60 +-
.../experiment_model.thrift | 6 +
14 files changed, 6551 insertions(+), 10153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 7ff89d7..8b4072f 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
@@ -124,7 +124,8 @@ public class AiravataServerHandler implements Airavata.Iface {
* @return true/false
*/
@Override
- public boolean isUserExists(AuthzToken authzToken, String gatewayId, String userName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean isUserExists(AuthzToken authzToken, String gatewayId, String userName) throws InvalidRequestException,
+ AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
return ExpCatResourceUtils.isUserExist(userName, gatewayId);
} catch (RegistryException e) {
@@ -754,86 +755,30 @@ public class AiravataServerHandler implements Airavata.Iface {
}
/**
- * Get all Project for user by project name with pagination. Results will be ordered based
- * on creation time DESC
*
- * @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
- * @param limit
- * The amount results to be fetched
- * @param offset
- * The starting point of the results to be fetched
- */
- @Override
- @SecurityCheck
- 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)){
- logger.error("Username cannot be empty. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Username cannot be empty. Please provide a valid user..");
- throw exception;
- }
- if (!isGatewayExistInternal(gatewayId)){
- logger.error("Gateway does not exist.Please provide a valid gateway id...");
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
- }
- try {
- if (!ExpCatResourceUtils.isUserExist(userName, gatewayId)){
- logger.error("User does not exist in the system. Please provide a valid user..");
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("User does not exist in the system. Please provide a valid user..");
- throw exception;
- }
- List<Project> projects = new ArrayList<Project>();
- experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
- filters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
- filters.put(Constants.FieldConstants.ProjectConstants.PROJECT_NAME, projectName);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, filters, limit, offset,
- Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
- for (Object object : results) {
- projects.add((Project)object);
- }
- logger.debug("Airavata retrieved projects for user : " + userName + " and gateway id : " + gatewayId + " with project name : " + projectName);
- return projects;
- }catch (Exception e) {
- logger.error("Error while retrieving projects", e);
- AiravataSystemException exception = new AiravataSystemException();
- exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error while retrieving projects. More info : " + e.getMessage());
- throw exception;
- }
- }
-
- /**
- * Search and get all Projects for user by project description with pagination. Results
- * will be ordered based on creation time DESC
+ * Search User Projects
+ * Search and get all Projects for user by project description or/and project name with pagination.
+ * Results will be ordered based on creation time DESC.
+ *
+ * @param gatewayId
+ * The unique identifier of the gateway making the request.
+ *
+ * @param userName
+ * The identifier of the user.
+ *
+ * @param filters
+ * Map of multiple filter criteria. Currenlt search filters includes Project Name and Project Description
+ *
+ * @param limit
+ * The amount results to be fetched.
+ *
+ * @param offset
+ * The starting point of the results to be fetched.
*
- * @param gatewayId
- * The identifier for the requested gateway.
- * @param userName
- * The identifier of the user
- * @param description
- * The description to be matched
- * @param limit
- * The amount results to be fetched
- * @param offset
- * The starting point of the results to be fetched
*/
@Override
- @SecurityCheck
- public List<Project> searchProjectsByProjectDesc(AuthzToken authzToken, String gatewayId, String userName,
- String description, int limit, int offset) throws InvalidRequestException,
- AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public List<Project> searchProjects(AuthzToken authzToken, String gatewayId, String userName, Map<ProjectSearchFields,
+ String> filters, int limit, int offset) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
if (!validateString(userName)){
logger.error("Username cannot be empty. Please provide a valid user..");
AiravataSystemException exception = new AiravataSystemException();
@@ -855,16 +800,23 @@ public class AiravataServerHandler implements Airavata.Iface {
}
List<Project> projects = new ArrayList<Project>();
experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
- Map<String, String> filters = new HashMap<String, String>();
- filters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
- filters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
- filters.put(Constants.FieldConstants.ProjectConstants.DESCRIPTION, description);
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, filters, limit, offset,
+ Map<String, String> regFilters = new HashMap<String, String>();
+ regFilters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
+ regFilters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
+ for(Map.Entry<ProjectSearchFields, String> entry : filters.entrySet())
+ {
+ if(entry.getKey().equals(ProjectSearchFields.PROJECT_NAME)){
+ regFilters.put(Constants.FieldConstants.ProjectConstants.PROJECT_NAME, entry.getValue());
+ }else if(entry.getKey().equals(ProjectSearchFields.PROJECT_DESCRIPTION)){
+ regFilters.put(Constants.FieldConstants.ProjectConstants.DESCRIPTION, entry.getValue());
+ }
+ }
+ List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, regFilters, limit, offset,
Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
projects.add((Project)object);
}
- logger.debug("Airavata retrieved projects for user : " + userName + " and gateway id : " + gatewayId + " with project description : " + description);
+ logger.debug("Airavata retrieved projects for user : " + userName + " and gateway id : " + gatewayId);
return projects;
}catch (Exception e) {
logger.error("Error while retrieving projects", e);
@@ -875,6 +827,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
+
/**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
* based on creation time DESC
[49/53] [abbrv] airavata git commit: adding hasOptionalFileInputs to
the Application interface
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 b951554..1a9761c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 a43d0f7..9ca3cfe 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 2684b47..bb14ef8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 c9d9660..2cb70c6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 581c2c1..1760f95 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 6cf6f12..8362503 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 c995727..6f1704b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 1c10c14..da66e7d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 5768a03..6230a41 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 33540ce..06fbea6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 a6cb57f..7f5e40a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 84d372a..ead501e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 5e02ea1..2f8f94f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 00dc303..d854bf5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 24e357d..54a4105 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 cce60d5..5faeaef 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 e4d5fb5..8901f85 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 07399c7..b0b3169 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 e034118..f1e97ec 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 d0a2b19..8b6da4b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 66a7845..ace3c91 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 ea60495..367820d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 5104c6a..140c404 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 ff0f630..714f267 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 29cd318..20fdd62 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 5281adb..0ea390b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 53b97dd..006d391 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 2816e40..5214e17 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 3783f4f..87a90c3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 b5e6018..b6a4fcf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 1b2e578..ad5d994 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 25688e0..01a1932 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 0729151..a46a3c6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 222d749..2858048 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 399bd9a..4286a11 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index b0ad577..a7fc645 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index 2104cab..f455b3a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 6dd5d1d..ab3a5f6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 40debf9..0a13976 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index bbbde8d..ff2b2cb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 04cee04..272f096 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 a6a45ce..c493a32 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index def2129..5d7a764 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/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 7d67634..3b09f70 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.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/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 bb184d6..ddf6b84 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.3)", date = "2016-07-05")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-06")
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/0b40482a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
index e6af5bb..3406c9e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationInterfaceImpl.java
@@ -77,6 +77,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
resource.setAppDescription(applicationInterfaceDescription.getApplicationDescription());
resource.setGatewayId(gatewayId);
resource.setArchiveWorkingDirectory(applicationInterfaceDescription.isArchiveWorkingDirectory());
+ resource.setHasOptionalFileInputs(applicationInterfaceDescription.isHasOptionalFileInputs());
resource.save();
applicationInterfaceDescription.setApplicationInterfaceId(resource.getInterfaceId());
@@ -178,6 +179,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
AppInterfaceResource existingInterface = (AppInterfaceResource) resource.get(interfaceId);
existingInterface.setAppName(updatedInterface.getApplicationName());
existingInterface.setAppDescription(updatedInterface.getApplicationDescription());
+ existingInterface.setHasOptionalFileInputs(updatedInterface.isHasOptionalFileInputs());
existingInterface.setArchiveWorkingDirectory(updatedInterface.isArchiveWorkingDirectory());
existingInterface.save();
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationInterface.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationInterface.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationInterface.java
index 30cc95f..446aef6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationInterface.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationInterface.java
@@ -44,6 +44,8 @@ public class ApplicationInterface implements Serializable {
private String gatewayId;
@Column(name = "ARCHIVE_WORKING_DIRECTORY")
private boolean archiveWorkingDirectory;
+ @Column(name = "HAS_OPTIONAL_FILE_INPUTS")
+ private boolean hasOptionalFileInputs;
@Column(name = "UPDATE_TIME")
private Timestamp updateTime;
@@ -103,4 +105,12 @@ public class ApplicationInterface implements Serializable {
public void setAppDescription(String appDescription) {
this.appDescription = appDescription;
}
+
+ public boolean isHasOptionalFileInputs() {
+ return hasOptionalFileInputs;
+ }
+
+ public void setHasOptionalFileInputs(boolean hasOptionalFileInputs) {
+ this.hasOptionalFileInputs = hasOptionalFileInputs;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
index 72be684..3287eab 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppInterfaceResource.java
@@ -46,6 +46,7 @@ public class AppInterfaceResource extends AppCatAbstractResource {
private Timestamp updatedTime;
private String gatewayId;
private boolean archiveWorkingDirectory;
+ private boolean hasOptionalFileInputs;
public String getGatewayId() {
return gatewayId;
@@ -103,6 +104,14 @@ public class AppInterfaceResource extends AppCatAbstractResource {
this.appDescription = appDescription;
}
+ public boolean isHasOptionalFileInputs() {
+ return hasOptionalFileInputs;
+ }
+
+ public void setHasOptionalFileInputs(boolean hasOptionalFileInputs) {
+ this.hasOptionalFileInputs = hasOptionalFileInputs;
+ }
+
@Override
public void remove(Object identifier) throws AppCatalogException {
EntityManager em = null;
@@ -370,6 +379,7 @@ public class AppInterfaceResource extends AppCatAbstractResource {
existigAppInterface.setUpdateTime(AiravataUtils.getCurrentTimestamp());
existigAppInterface.setGatewayId(gatewayId);
existigAppInterface.setArchiveWorkingDirectory(archiveWorkingDirectory);
+ existigAppInterface.setHasOptionalFileInputs(hasOptionalFileInputs);
em.merge(existigAppInterface);
}else {
ApplicationInterface applicationInterface = new ApplicationInterface();
@@ -379,6 +389,7 @@ public class AppInterfaceResource extends AppCatAbstractResource {
applicationInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
applicationInterface.setGatewayId(gatewayId);
applicationInterface.setArchiveWorkingDirectory(archiveWorkingDirectory);
+ existigAppInterface.setHasOptionalFileInputs(hasOptionalFileInputs);
em.persist(applicationInterface);
}
em.getTransaction().commit();
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index ef14eed..c839e50 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -786,6 +786,7 @@ public class AppCatalogJPAUtils {
resource.setCreatedTime(o.getCreationTime());
resource.setGatewayId(o.getGatewayId());
resource.setArchiveWorkingDirectory(o.isArchiveWorkingDirectory());
+ resource.setHasOptionalFileInputs(o.isHasOptionalFileInputs());
if (o.getUpdateTime() != null) {
resource.setUpdatedTime(o.getUpdateTime());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 42b3969..be31d46 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -608,6 +608,7 @@ public class AppCatalogThriftConversion {
description.setApplicationName(resource.getAppName());
description.setApplicationDescription(resource.getAppDescription());
description.setArchiveWorkingDirectory(resource.isArchiveWorkingDirectory());
+ description.setHasOptionalFileInputs(resource.isHasOptionalFileInputs());
AppModuleMappingAppCatalogResourceAppCat appModuleMappingResource = new AppModuleMappingAppCatalogResourceAppCat();
List<AppCatalogResource> appModules = appModuleMappingResource.get(AppCatAbstractResource.AppModuleMappingConstants.INTERFACE_ID, resource.getInterfaceId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b40482a/thrift-interface-descriptions/data-models/app-catalog-models/application_interface_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/application_interface_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/application_interface_model.thrift
index 1598399..8dd7a18 100644
--- a/thrift-interface-descriptions/data-models/app-catalog-models/application_interface_model.thrift
+++ b/thrift-interface-descriptions/data-models/app-catalog-models/application_interface_model.thrift
@@ -53,5 +53,6 @@ struct ApplicationInterfaceDescription {
4: optional list<string> applicationModules,
5: optional list<application_io_models.InputDataObjectType> applicationInputs,
6: optional list<application_io_models.OutputDataObjectType> applicationOutputs,
- 7: optional bool archiveWorkingDirectory = 0
+ 7: optional bool archiveWorkingDirectory = 0,
+ 8: optional bool hasOptionalFileInputs
}
\ No newline at end of file
[46/53] [abbrv] airavata git commit: sorting job list based on time
Posted by sh...@apache.org.
sorting job list based on time
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c382ae2a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c382ae2a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c382ae2a
Branch: refs/heads/master
Commit: c382ae2ab059240d48938664794498d78999056b
Parents: b9b43b6
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 5 16:56:28 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 5 16:56:28 2016 -0400
----------------------------------------------------------------------
.../api/server/handler/AiravataServerHandler.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c382ae2a/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 a274641..1a7ee72 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
@@ -80,10 +80,7 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class AiravataServerHandler implements Airavata.Iface {
private static final Logger logger = LoggerFactory.getLogger(AiravataServerHandler.class);
@@ -1259,6 +1256,12 @@ public class AiravataServerHandler implements Airavata.Iface {
List<JobModel> jobList = new ArrayList<JobModel>();
if(jobObjects != null){
jobObjects.stream().forEach(j -> jobList.add((JobModel)j));
+ Collections.sort(jobList, new Comparator<JobModel>() {
+ @Override
+ public int compare(JobModel o1, JobModel o2) {
+ return (int) (o1.getCreationTime() - o2.getCreationTime());
+ }
+ });
t.setJobs(jobList);
}
} catch (RegistryException e) {
[39/53] [abbrv] airavata git commit: Added meaningful log messages
and refactore ServerMain and Airavata Thrift Servers
Posted by sh...@apache.org.
Added meaningful log messages and refactore ServerMain and Airavata Thrift Servers
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/11558d6a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/11558d6a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/11558d6a
Branch: refs/heads/master
Commit: 11558d6a56c6e86981c9e32939352de8e83f2894
Parents: 8e39083
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Thu Jun 23 12:39:19 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jun 28 16:32:37 2016 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 11 +++---
.../main/resources/bin/airavata-server-start.sh | 11 +++---
.../apache/airavata/gfac/server/GfacServer.java | 12 +++----
.../orchestrator/server/OrchestratorServer.java | 19 ++++-------
.../org/apache/airavata/server/ServerMain.java | 35 ++++++++++++--------
5 files changed, 45 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/11558d6a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index 6c429d2..01649ab 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -124,10 +124,8 @@ public class AiravataAPIServer implements IServer{
}
}
}.start();
- }
-// storeServerConfig();
- /**********start thrift server over TLS******************/
- if (ServerSettings.isTLSEnabled()) {
+ logger.info("Started API Server ....");
+ } else { /**********start thrift server over TLS******************/
TSSLTransportFactory.TSSLTransportParameters TLSParams =
new TSSLTransportFactory.TSSLTransportParameters();
TLSParams.setKeyStore(ServerSettings.getKeyStorePath(), ServerSettings.getKeyStorePassword());
@@ -160,7 +158,7 @@ public class AiravataAPIServer implements IServer{
}
}
}.start();
- logger.info("Airavata API server starter over TLS on Port: " + ServerSettings.getTLSServerPort());
+ logger.info("API server started over TLS on Port: " + ServerSettings.getTLSServerPort() + " ...");
}
/*perform any security related initialization at the server startup, according to the underlying security
@@ -172,7 +170,8 @@ public class AiravataAPIServer implements IServer{
logger.error(e.getMessage());
setStatus(ServerStatus.FAILED);
ExperimentCatalogInitUtil.stopDerbyInServerMode();
- throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
+ logger.error("Failed to start Gfac server ...");
+ throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
} catch (ApplicationSettingsException e) {
logger.error(e.getMessage(), e);
throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
http://git-wip-us.apache.org/repos/asf/airavata/blob/11558d6a/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/bin/airavata-server-start.sh b/distribution/src/main/resources/bin/airavata-server-start.sh
index 6e1e412..599fdd8 100644
--- a/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -60,16 +60,17 @@ do
-h)
echo "Usage: airavata-server-start.sh [server-name/s] [command-options]"
echo "Server names:"
- echo " api Start api server"
- echo " gfac Start api server"
- echo " orchestrator Start api server"
+ echo " apiserver Start apiserver"
+ echo " gfac Start gfac server"
+ echo " orchestrator Start orchestrator server"
+ echo " credentialstore Start credentialstore server"
echo "command options:"
echo " -d Start server in daemon mode"
- echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
- echo " -nologo Do not show airavata logo"
echo " -xdebug Start Airavata Server under JPDA debugger"
+ echo " -nologo Do not show airavata logo"
echo " -security Enable Java 2 security"
+ echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
echo " -h Display this help and exit"
shift
exit 0
http://git-wip-us.apache.org/repos/asf/airavata/blob/11558d6a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
index db65e28..017afa0 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
@@ -50,8 +50,8 @@ public class GfacServer implements IServer{
public void StartGfacServer(GfacService.Processor<GfacServerHandler> gfacServerHandlerProcessor)
throws Exception {
- try {
- final int serverPort = Integer.parseInt(ServerSettings.getGFacServerPort());
+ final int serverPort = Integer.parseInt(ServerSettings.getGFacServerPort());
+ try {
final String serverHost = ServerSettings.getGfacServerHost();
InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
@@ -63,8 +63,8 @@ public class GfacServer implements IServer{
new Thread() {
public void run() {
server.serve();
- setStatus(IServer.ServerStatus.STOPPED);
- logger.info("Gfac Server Stopped.");
+ setStatus(ServerStatus.STARTING);
+ logger.info("Starting Gfac Server ...");
}
}.start();
new Thread() {
@@ -78,14 +78,14 @@ public class GfacServer implements IServer{
}
if (server.isServing()){
setStatus(IServer.ServerStatus.STARTED);
- logger.info("Starting Gfac Server on Port " + serverPort);
- logger.info("Listening to Gfac Clients ....");
+ logger.info("Started Gfac Server on Port " + serverPort + " ...");
}
}
}.start();
} catch (TTransportException e) {
logger.error(e.getMessage());
setStatus(IServer.ServerStatus.FAILED);
+ logger.error("Failed to start Gfac server on port " + serverPort + " ...");
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/11558d6a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
index e2c5eaf..7b33e82 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
@@ -51,31 +51,26 @@ public class OrchestratorServer implements IServer {
public void StartOrchestratorServer(OrchestratorService.Processor<OrchestratorServerHandler> orchestratorServerHandlerProcessor)
throws Exception {
- try {
- final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_PORT, "8940"));
-
+ final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_PORT, "8940"));
+ try {
final String serverHost = ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_HOST, null);
-
TServerTransport serverTransport;
-
if(serverHost == null){
serverTransport = new TServerSocket(serverPort);
}else{
InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
serverTransport = new TServerSocket(inetSocketAddress);
}
-
//server = new TSimpleServer(
// new TServer.Args(serverTransport).processor(orchestratorServerHandlerProcessor));
TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
options.minWorkerThreads = Integer.parseInt(ServerSettings.getSetting(Constants.ORCHESTRATOT_SERVER_MIN_THREADS, "30"));
server = new TThreadPoolServer(options.processor(orchestratorServerHandlerProcessor));
-
new Thread() {
public void run() {
server.serve();
- setStatus(ServerStatus.STOPPED);
- logger.info("Orchestrator Server Stopped.");
+ setStatus(ServerStatus.STARTING);
+ logger.info("Starting Orchestrator Server ... ");
}
}.start();
new Thread() {
@@ -89,15 +84,15 @@ public class OrchestratorServer implements IServer {
}
if (server.isServing()){
setStatus(ServerStatus.STARTED);
- logger.info("Starting Orchestrator Server on Port " + serverPort);
- logger.info("Listening to Orchestrator Clients ....");
+ logger.info("Started Orchestrator Server on Port " + serverPort + " ...");
}
}
}.start();
} catch (TTransportException e) {
logger.error(e.getMessage());
setStatus(ServerStatus.FAILED);
- }
+ logger.error("Failed to start Orchestrator server on port " + serverPort + " ...");
+ }
}
public static void main(String[] args) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/11558d6a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 8055dda..0661a32 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -25,6 +25,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.airavata.common.exception.ApplicationSettingsException;
@@ -42,12 +43,18 @@ public class ServerMain {
private static final String SERVERS_KEY="servers";
private final static Logger logger = LoggerFactory.getLogger(ServerMain.class);
private static boolean serversLoaded=false;
- private static final String stopFileNamePrefix = "airavata-server-stop";
+ private static final String stopFileNamePrefix = "server-stop";
private static int serverPID=-1;
private static final String serverStartedFileNamePrefix = "server-start";
private static boolean systemShutDown=false;
private static String STOP_COMMAND_STR = "stop";
+ // server names
+ private static String API_SERVER = "apiserver";
+ private static String CREDENTIAL_STORE = "credentialstore";
+ private static String GFAC_SERVER = "gfac";
+ private static String ORCHESTRATOR = "orcestrator";
+
private static ServerCnxnFactory cnxnFactory;
// private static boolean shutdownHookCalledBefore=false;
static{
@@ -57,7 +64,7 @@ public class ServerMain {
private static void loadServers(String serverNames) {
try {
if (serverNames !=null){
- String[] serversList = serverNames.split(",");
+ List<String> serversList = handleServerDependencies(serverNames);
for (String serverString : serversList) {
serverString=serverString.trim();
String serverClassName = ServerSettings.getSetting(serverString);
@@ -90,6 +97,18 @@ public class ServerMain {
});
}
+ private static List<String> handleServerDependencies(String serverNames) {
+ List<String> serverList = new ArrayList<>(Arrays.asList(serverNames.split(",")));
+ // credential store should start before api server
+ int credPos = serverList.indexOf(CREDENTIAL_STORE);
+ if (credPos > 0) { // neither absent nor credentialstore is first element
+ String temp = serverList.get(0);
+ serverList.set(0, serverList.get(credPos));
+ serverList.set(credPos, temp);
+ }
+ return serverList;
+ }
+
// private static void addSecondaryShutdownHook(){
// Runtime.getRuntime().addShutdownHook(new Thread(){
// @Override
@@ -104,18 +123,6 @@ public class ServerMain {
// }
public static void main(String args[]) throws ParseException, IOException {
-// Properties properties = System.getProperties();
-// for (Object key : properties.keySet()) {
-// System.out.println(key.toString()+" = "+properties.get(key));
-// }
-// Map<String, String> env = System.getenv();
-//
-// for (Object key : env.keySet()) {
-// System.out.println(key.toString()+" = "+env.get(key));
-// }
-// if (true){
-// return;
-// }
CommandLineParameters commandLineParameters = StringUtil.getCommandLineParser(args);
if (commandLineParameters.getArguments().contains(STOP_COMMAND_STR)){
performServerStopRequest(commandLineParameters);
[36/53] [abbrv] airavata git commit: updating the search projects API
method
Posted by sh...@apache.org.
updating the search projects API method
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/aedabdb3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/aedabdb3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/aedabdb3
Branch: refs/heads/master
Commit: aedabdb322fab68cd9432fcf3475eccaba02d52d
Parents: 7a636a4
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 18:58:43 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 18:58:43 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 20 +++++++++++++-------
.../catalog/impl/ProjectRegistry.java | 4 ++--
.../catalog/resources/WorkerResource.java | 15 +++++++++++++--
3 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/aedabdb3/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 ab33786..a274641 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
@@ -74,7 +74,6 @@ import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
-import org.apache.airavata.registry.core.experiment.catalog.model.ExperimentSummary;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.thrift.TException;
@@ -802,7 +801,6 @@ public class AiravataServerHandler implements Airavata.Iface {
List<Project> projects = new ArrayList<Project>();
experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
Map<String, String> regFilters = new HashMap<String, String>();
- regFilters.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
regFilters.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
for(Map.Entry<ProjectSearchFields, String> entry : filters.entrySet())
{
@@ -812,8 +810,18 @@ public class AiravataServerHandler implements Airavata.Iface {
regFilters.put(Constants.FieldConstants.ProjectConstants.DESCRIPTION, entry.getValue());
}
}
- List<Object> results = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, regFilters, limit, offset,
- Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
+
+ //FIXME - These accessible IDs should come from grouper
+ Map<String, String> temp = new HashMap();
+ temp.put(Constants.FieldConstants.ProjectConstants.OWNER, userName);
+ temp.put(Constants.FieldConstants.ProjectConstants.GATEWAY_ID, gatewayId);
+ List<Object> allUserProjects = experimentCatalog.search(ExperimentCatalogModelType.PROJECT, temp, -1,
+ 0, Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
+ List<String> accessibleProjIds = new ArrayList<>();
+ allUserProjects.stream().forEach(e->accessibleProjIds.add(((Project) e).getProjectID()));
+
+ List<Object> results = experimentCatalog.searchAllAccessible(ExperimentCatalogModelType.PROJECT, accessibleProjIds,
+ regFilters, limit, offset, Constants.FieldConstants.ProjectConstants.CREATION_TIME, ResultOrderType.DESC);
for (Object object : results) {
projects.add((Project)object);
}
@@ -871,8 +879,6 @@ public class AiravataServerHandler implements Airavata.Iface {
List<ExperimentSummaryModel> summaries = new ArrayList<ExperimentSummaryModel>();
experimentCatalog = RegistryFactory.getExperimentCatalog(gatewayId);
Map<String, String> regFilters = new HashMap();
- //FIXME
- //regFilters.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
regFilters.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
for(Map.Entry<ExperimentSearchFields, String> entry : filters.entrySet())
{
@@ -893,7 +899,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
- //FIXME
+ //FIXME - These accessible IDs should come from grouper
Map<String, String> temp = new HashMap();
temp.put(Constants.FieldConstants.ExperimentConstants.USER_NAME, userName);
temp.put(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID, gatewayId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/aedabdb3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
index 8861b68..9e16daa 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
@@ -247,7 +247,7 @@ public class ProjectRegistry {
}
}
List<ProjectResource> projectResources = workerResource
- .searchProjects(fil, limit, offset, orderByIdentifier, resultOrderType);
+ .searchProjects(fil, null, limit, offset, orderByIdentifier, resultOrderType);
if (projectResources != null && !projectResources.isEmpty()){
for (ProjectResource pr : projectResources){
projects.add(ThriftDataModelConversion.getProject(pr));
@@ -294,7 +294,7 @@ public class ProjectRegistry {
}
}
List<ProjectResource> projectResources = workerResource
- .searchProjects(fil, limit, offset, orderByIdentifier, resultOrderType);
+ .searchProjects(fil, accessibleIds, limit, offset, orderByIdentifier, resultOrderType);
if (projectResources != null && !projectResources.isEmpty()){
for (ProjectResource pr : projectResources){
projects.add(ThriftDataModelConversion.getProject(pr));
http://git-wip-us.apache.org/repos/asf/airavata/blob/aedabdb3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index 5fdc265..dec4e7f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -508,12 +508,23 @@ public class WorkerResource extends AbstractExpCatResource {
* @return
* @throws org.apache.airavata.registry.cpi.RegistryException
*/
- public List<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource> searchProjects(Map<String, String> filters, int limit,
- int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
+ public List<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource> searchProjects(
+ Map<String, String> filters, List<String> accessibleIds, int limit, int offset, Object orderByIdentifier,
+ ResultOrderType resultOrderType) throws RegistryException {
+
List<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource> result = new ArrayList<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource>();
EntityManager em = null;
try {
String query = "SELECT DISTINCT p from Project p WHERE ";
+
+ // FIXME There is a performance bottleneck for using IN clause. Try using temporary tables ?
+ if(accessibleIds != null){
+ query += " p.projectId IN (";
+ for(String id : accessibleIds)
+ query += ("'" + id + "'" + ",");
+ query = query.substring(0, query.length()-1) + ") AND ";
+ }
+
if (filters != null && filters.size() != 0) {
for (String field : filters.keySet()) {
String filterVal = filters.get(field);
[32/53] [abbrv] airavata git commit: fixing query typo
Posted by sh...@apache.org.
fixing query typo
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/233e6142
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/233e6142
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/233e6142
Branch: refs/heads/master
Commit: 233e6142915ddc5973e8a15dd56d9d4a628c4cd7
Parents: 4e53f23
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 18:05:38 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 18:05:38 2016 -0400
----------------------------------------------------------------------
.../registry/core/experiment/catalog/resources/WorkerResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/233e6142/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index bddeae4..44e474b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -601,7 +601,7 @@ public class WorkerResource extends AbstractExpCatResource {
query += " e.experimentId IN (";
for(String id : accessibleIds)
query += (id + ",");
- query = query.substring(0, query.length()-1) + ") ";
+ query = query.substring(0, query.length()-1) + ") AND ";
}
if (filters.get(ExperimentStatusConstants.STATE) != null) {
[27/53] [abbrv] airavata git commit: fixing build failure
Posted by sh...@apache.org.
fixing build failure
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d23d5728
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d23d5728
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d23d5728
Branch: refs/heads/master
Commit: d23d5728877f3e948417063f807ba4054bf6bc07
Parents: cded43e
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:12:02 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:12:02 2016 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/impl/RegistryFactory.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d23d5728/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java
index 8e4ed08..e57d15b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/RegistryFactory.java
@@ -112,11 +112,4 @@ public class RegistryFactory {
return replicaCatalog;
}
-
- public static ExperimentCatalog getLoggingRegistry() {
- if(experimentCatalog == null) {
- experimentCatalog = new LoggingExperimentCatalogImpl();
- }
- return experimentCatalog;
- }
}
[08/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
adding get all users in gateway method
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9dd7c14a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9dd7c14a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9dd7c14a
Branch: refs/heads/master
Commit: 9dd7c14a94736e379cc46acb7e10dd22a8c8dfad
Parents: e0050dd
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 13:29:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 13:29:54 2016 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 22 +
.../java/org/apache/airavata/api/Airavata.java | 4093 ++++++++++++------
.../main/resources/lib/airavata/Airavata.cpp | 2453 +++++++----
.../src/main/resources/lib/airavata/Airavata.h | 173 +
.../lib/airavata/Airavata_server.skeleton.cpp | 19 +
.../resources/lib/Airavata/API/Airavata.php | 1632 ++++---
.../lib/apache/airavata/api/Airavata-remote | 7 +
.../lib/apache/airavata/api/Airavata.py | 1246 ++++--
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/user/NSFDemographics.java | 2 +-
.../apache/airavata/model/user/UserProfile.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Notification.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../resources/airavata-default-xacml-policy.xml | 1 +
.../app/catalog/util/AppCatalogJPAUtils.java | 1 -
.../experiment/catalog/ExpCatResourceUtils.java | 32 +-
.../catalog/utils/ReplicaCatalogJPAUtils.java | 1 -
.../catalog/utils/WorkflowCatalogJPAUtils.java | 1 -
.../airavata-apis/airavata_api.thrift | 17 +
99 files changed, 6442 insertions(+), 3426 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 f17cc63..f4edd91 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
@@ -169,6 +169,28 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
+ /**
+ * Get all users in the gateway
+ *
+ * @param authzToken
+ * @param gatewayId The gateway data model.
+ * @return users
+ * list of usernames of the users in the gateway
+ */
+ @Override
+ public List<String> getAllUsersInGateway(AuthzToken authzToken, String gatewayId) throws InvalidRequestException,
+ AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ try {
+ return ExpCatResourceUtils.getAllUsersInGateway(gatewayId);
+ } catch (RegistryException e) {
+ logger.error("Error while retrieving users", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while retrieving users. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
@Override
@SecurityCheck
public void updateGateway(AuthzToken authzToken, String gatewayId, Gateway updatedGateway)
[09/53] [abbrv] airavata git commit: removing stale class
Posted by sh...@apache.org.
removing stale class
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/69e71fbd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/69e71fbd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/69e71fbd
Branch: refs/heads/master
Commit: 69e71fbd04752e60e9dcbe6e2a2bbc78cac15ca1
Parents: 9dd7c14
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 15:25:51 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 15:25:51 2016 -0400
----------------------------------------------------------------------
.../impl/LoggingExperimentCatalogImpl.java | 97 --------------------
1 file changed, 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/69e71fbd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/LoggingExperimentCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/LoggingExperimentCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/LoggingExperimentCatalogImpl.java
deleted file mode 100644
index 4849385..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/LoggingExperimentCatalogImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.experiment.catalog.impl;
-
-import org.apache.airavata.registry.cpi.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Map;
-
-public class LoggingExperimentCatalogImpl implements ExperimentCatalog {
- private final static Logger logger = LoggerFactory.getLogger(LoggingExperimentCatalogImpl.class);
-
- @Override
- public Object add(ExpCatParentDataType dataType, Object newObjectToAdd, String gatewayId) throws RegistryException {
- return null;
- }
-
- @Override
- public Object add(ExpCatChildDataType dataType, Object newObjectToAdd, Object dependentIdentifiers) throws RegistryException {
- return null;
- }
-
- @Override
- public void update(ExperimentCatalogModelType dataType, Object newObjectToUpdate, Object identifier) throws RegistryException {
-
- }
-
- @Override
- public void update(ExperimentCatalogModelType dataType, Object identifier, String fieldName, Object value) throws RegistryException {
-
- }
-
- @Override
- public Object get(ExperimentCatalogModelType dataType, Object identifier) throws RegistryException {
- return null;
- }
-
- @Override
- public List<Object> get(ExperimentCatalogModelType dataType, String fieldName, Object value) throws RegistryException {
- return null;
- }
-
- @Override
- public List<Object> get(ExperimentCatalogModelType dataType, String fieldName, Object value, int limit, int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
- return null;
- }
-
- @Override
- public List<Object> search(ExperimentCatalogModelType dataType, Map<String, String> filters) throws RegistryException {
- return null;
- }
-
- @Override
- public List<Object> search(ExperimentCatalogModelType dataType, Map<String, String> filters, int limit, int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
- return null;
- }
-
- @Override
- public Object getValue(ExperimentCatalogModelType dataType, Object identifier, String field) throws RegistryException {
- return null;
- }
-
- @Override
- public List<String> getIds(ExperimentCatalogModelType dataType, String fieldName, Object value) throws RegistryException {
- return null;
- }
-
- @Override
- public void remove(ExperimentCatalogModelType dataType, Object identifier) throws RegistryException {
-
- }
-
- @Override
- public boolean isExist(ExperimentCatalogModelType dataType, Object identifier) throws RegistryException {
- return false;
- }
-}
[43/53] [abbrv] airavata git commit: Added URI_COLLECTION Data type
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 7706211..c995727 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 c13af33..1c10c14 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 ce8d5f5..5768a03 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 bab97b1..33540ce 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 49eac43..a6cb57f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 78fba1e..84d372a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 6640e8e..5e02ea1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 9327fa2..00dc303 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 b7967fc..24e357d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 3c06ee6..cce60d5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 918b840..e4d5fb5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 be663c7..07399c7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 aa09ca3..e034118 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 17b8df9..d0a2b19 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 d3b8d7f..66a7845 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 b85850d..ea60495 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 7a4ad4d..5104c6a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 d6ecde5..ff0f630 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 0b6a153..29cd318 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 14b1cf9..5281adb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 1d36b92..53b97dd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 22069d9..2816e40 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 f88ffff..3783f4f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 a8efbcb..b5e6018 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 e616e04..1b2e578 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 ec39e4f..25688e0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 c1ce7a5..0729151 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 42125d9..222d749 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 98147cd..399bd9a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index 4658dac..b0ad577 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index be08757..2104cab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 4b10525..6dd5d1d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
index 0a4b83b..40debf9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class NSFDemographics implements org.apache.thrift.TBase<NSFDemographics, NSFDemographics._Fields>, java.io.Serializable, Cloneable, Comparable<NSFDemographics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NSFDemographics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index fe66d71..bbbde8d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory;
* * User\u2019s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
* *
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class UserProfile implements org.apache.thrift.TBase<UserProfile, UserProfile._Fields>, java.io.Serializable, Cloneable, Comparable<UserProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 0106ee3..04cee04 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 34abe2b..a6a45ce 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
index 7fa91a5..def2129 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
public class Notification implements org.apache.thrift.TBase<Notification, Notification._Fields>, java.io.Serializable, Cloneable, Comparable<Notification> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Notification");
http://git-wip-us.apache.org/repos/asf/airavata/blob/56450315/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 ae3d0b5..7d67634 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.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/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 65af2d0..bb184d6 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.3)", date = "2016-06-27")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-07-05")
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/56450315/thrift-interface-descriptions/data-models/app-catalog-models/application_io_models.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/application_io_models.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/application_io_models.thrift
index 5098735..e4e5d1e 100644
--- a/thrift-interface-descriptions/data-models/app-catalog-models/application_io_models.thrift
+++ b/thrift-interface-descriptions/data-models/app-catalog-models/application_io_models.thrift
@@ -34,6 +34,7 @@ enum DataType{
INTEGER,
FLOAT,
URI,
+ URI_COLLECTION,
STDOUT,
STDERR
}
[45/53] [abbrv] airavata git commit: Handled URI_COLLECTION input
data type
Posted by sh...@apache.org.
Handled URI_COLLECTION input data type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b9b43b6b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b9b43b6b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b9b43b6b
Branch: refs/heads/master
Commit: b9b43b6bf21155ad4098e346cedb78848f6032ef
Parents: 5645031
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Jul 5 12:19:14 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Jul 5 12:19:14 2016 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/core/GFacConstants.java | 2 +-
.../org/apache/airavata/gfac/core/GFacUtils.java | 14 ++++++++++++++
.../apache/airavata/gfac/impl/GFacEngineImpl.java | 15 +++++++++++++--
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
4 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b9b43b6b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacConstants.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacConstants.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacConstants.java
index 444956b..6b7531a 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacConstants.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacConstants.java
@@ -50,7 +50,7 @@ public class GFacConstants {
public static final String _127_0_0_1 = "127.0.0.1";
public static final String LOCALHOST = "localhost";
-
+ public static final String MULTIPLE_INPUTS_SPLITTER = ",";
public static final String PROP_WORKFLOW_INSTANCE_ID = "workflow.instance.id";
public static final String PROP_WORKFLOW_NODE_ID = "workflow.node.id";
http://git-wip-us.apache.org/repos/asf/airavata/blob/b9b43b6b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 799ea28..17d9b15 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -491,6 +491,20 @@ public class GFacUtils {
String filePath = inputDataObjectType.getValue();
filePath = filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length());
inputValues.add(filePath);
+ } else if (inputDataObjectType.getType() == DataType.URI_COLLECTION) {
+ String filePaths = inputDataObjectType.getValue();
+ String[] paths = filePaths.split(GFacConstants.MULTIPLE_INPUTS_SPLITTER);
+ String filePath;
+ String inputs = "";
+ int i = 0;
+ for (; i < paths.length - 1; i++) {
+ filePath = paths[i];
+ filePath = filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length());
+ // File names separate by a space
+ inputs += filePath + " ";
+ }
+ inputs += paths[i];
+ inputValues.add(inputs);
} else {
inputValues.add(inputDataObjectType.getValue());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b9b43b6b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
index c0e2526..3fb95e0 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
@@ -26,6 +26,7 @@ import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.common.utils.ZkConstants;
+import org.apache.airavata.gfac.core.GFacConstants;
import org.apache.airavata.gfac.core.GFacEngine;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.GFacUtils;
@@ -535,12 +536,22 @@ public class GFacEngineImpl implements GFacEngine {
GFacUtils.saveAndPublishTaskStatus(taskContext);
ProcessContext processContext = taskContext.getParentProcessContext();
+ // handle URI_COLLECTION input data type
Task dMoveTask = Factory.getDataMovementTask(processContext.getDataMovementProtocol());
- taskStatus = executeTask(taskContext, dMoveTask, false);
+ if (taskContext.getProcessInput().getType() == DataType.URI_COLLECTION) {
+ String values = taskContext.getProcessInput().getValue();
+ String[] multiple_inputs = values.split(GFacConstants.MULTIPLE_INPUTS_SPLITTER);
+ for (String input : multiple_inputs) {
+ taskContext.getProcessInput().setValue(input);
+ taskStatus = executeTask(taskContext, dMoveTask, false);
+ }
+ taskContext.getProcessInput().setValue(values);
+ } else {
+ taskStatus = executeTask(taskContext, dMoveTask, false);
+ }
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
taskContext.setTaskStatus(taskStatus);
GFacUtils.saveAndPublishTaskStatus(taskContext);
-
checkFailures(taskContext, taskStatus, dMoveTask);
return false;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b9b43b6b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index 4489ef0..3e057cb 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -377,6 +377,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
case STDOUT:
break;
case URI:
+ case URI_COLLECTION:
try {
TaskModel inputDataStagingTask = getInputDataStagingTask(processModel, processInput, gatewayId);
String taskId = (String) orchestratorContext.getRegistry().getExperimentCatalog().add(ExpCatChildDataType.TASK, inputDataStagingTask,
[28/53] [abbrv] airavata git commit: fixing test failure
Posted by sh...@apache.org.
fixing test failure
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/49dfd423
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/49dfd423
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/49dfd423
Branch: refs/heads/master
Commit: 49dfd423fa32b08fb1ea73f6b11dad677b746966
Parents: d23d572
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 16:14:39 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 16:14:39 2016 -0400
----------------------------------------------------------------------
.../handler/AiravataServerHandlerTest.java | 43 +-------------------
1 file changed, 1 insertion(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/49dfd423/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
index 3311f02..0eeac88 100644
--- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
+++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
@@ -29,11 +29,9 @@ import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.model.experiment.ExperimentSummaryModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.security.AuthzToken;
-import org.apache.airavata.model.status.ExperimentState;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.model.workspace.Notification;
import org.apache.airavata.model.workspace.Project;
@@ -145,18 +143,9 @@ public class AiravataServerHandlerTest {
String projectId5 = airavataServerHandler.createProject(token, gatewayId, project);
Assert.assertNotNull(projectId5);
- //search project by project name
- List<Project> list = airavataServerHandler.searchProjectsByProjectName(token, gatewayId,
- "TestUser"+TAG, "Terrible"+TAG, 2, 0);
- Assert.assertTrue(list.size()==1);
-
- //search project by project description
- list = airavataServerHandler.searchProjectsByProjectDesc(token, gatewayId,
- "TestUser" + TAG, "test", 2, 1);
- Assert.assertTrue(list.size()==2);
//get all projects of user
- list = airavataServerHandler.getUserProjects(token, gatewayId, "TestUser"+TAG, 2,2);
+ List<Project> list = airavataServerHandler.getUserProjects(token, gatewayId, "TestUser"+TAG, 2,2);
Assert.assertTrue(list.size()==2);
Project project1 = list.get(0);
Project project2 = list.get(1);
@@ -262,36 +251,6 @@ public class AiravataServerHandlerTest {
String experimentId3 = airavataServerHandler.createExperiment(token, gatewayId, experiment);
Assert.assertNotNull(experimentId3);
- //searching experiments by name
- List<ExperimentSummaryModel> results = airavataServerHandler.searchExperimentsByName(token, gatewayId,
- "TestUser" + TAG, "Experiment2", 2, 0);
- Assert.assertTrue(results.size()==1);
-
- //searching experiments by creation time
- long time = System.currentTimeMillis();
- results = airavataServerHandler.searchExperimentsByCreationTime(token,
- gatewayId, "TestUser" + TAG, time-10000, time+1000, 2,0);
-
- Assert.assertTrue(results.size()==2);
-
- //searching based on experiment state
- ExperimentState experimentState = ExperimentState.findByValue(0);
- //with pagination
- results = airavataServerHandler.searchExperimentsByStatus(token,
- gatewayId, "TestUser" + TAG, experimentState, 2, 0);
- Assert.assertTrue(results.size()==2);
-
- //searching based on application
- results = airavataServerHandler.searchExperimentsByApplication(new AuthzToken(""),
- gatewayId, "TestUser" + TAG, "Ech", 2, 0);
- Assert.assertTrue(results.size()==2);
-
- //searching experiments by description
- results = airavataServerHandler.searchExperimentsByDesc(new AuthzToken(""),
- gatewayId, "TestUser" + TAG, "exp", 2, 0);
- Assert.assertTrue(results.size()==2);
-
-
//retrieving all experiments in project
List<ExperimentModel> list = airavataServerHandler.getExperimentsInProject(token, projectId1, 2, 1);
Assert.assertTrue(list.size()==2);
[10/53] [abbrv] airavata git commit: adding searchAllAccessible
ExperimentCatalogAPI
Posted by sh...@apache.org.
adding searchAllAccessible ExperimentCatalogAPI
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/10b7b128
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/10b7b128
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/10b7b128
Branch: refs/heads/master
Commit: 10b7b128515eb5e7cf27f4686815e7365d2fca21
Parents: 69e71fb
Author: scnakandala <su...@gmail.com>
Authored: Mon Jun 27 15:41:13 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jun 27 15:41:13 2016 -0400
----------------------------------------------------------------------
.../catalog/impl/ExperimentCatalogImpl.java | 45 +++++++++++++++++
.../catalog/impl/ExperimentRegistry.java | 52 ++++++++++++++++++++
.../catalog/impl/ProjectRegistry.java | 47 ++++++++++++++++++
.../registry/cpi/ExperimentCatalog.java | 16 ++++++
4 files changed, 160 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b7b128/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index a56e10b..3bc0b92 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -546,6 +546,51 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
}
/**
+ * This method search all the accessible resources given the set of ids of all accessible resource IDs.
+ *
+ * @param dataType Data type is a predefined type which the programmer should choose according to the object he
+ * is going to save in to registry
+ * @param accessibleIds list of string IDs of all accessible resources
+ * @param filters filters is a map of field name and value that you need to use for search filtration
+ * @param limit amount of the results to be returned
+ * @param offset offset of the results from the sorted list to be fetched from
+ * @param orderByIdentifier identifier (i.e the column) which will be used as the basis to sort the results
+ * @param resultOrderType The type of ordering (i.e ASC or DESC) that has to be used when retrieving the results
+ * @return List of objects according to the given criteria
+ */
+ @Override
+ public List<Object> searchAllAccessible(ExperimentCatalogModelType dataType, List<String> accessibleIds, Map<String,
+ String> filters, int limit, int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
+ try {
+ List<Object> result = new ArrayList<Object>();
+ switch (dataType) {
+ case PROJECT:
+ List<Project> projectList
+ = projectRegistry.searchAllAccessibleProjects(accessibleIds, filters, limit, offset,
+ orderByIdentifier, resultOrderType);
+ for (Project project : projectList ){
+ result.add(project);
+ }
+ return result;
+ case EXPERIMENT:
+ List<ExperimentSummaryModel> experimentSummaries = experimentRegistry
+ .searchAllAccessibleExperiments(accessibleIds, filters, limit, offset, orderByIdentifier,
+ resultOrderType);
+ for (ExperimentSummaryModel ex : experimentSummaries){
+ result.add(ex);
+ }
+ return result;
+ default:
+ logger.error("Unsupported data type...", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+ } catch (Exception e) {
+ logger.error("Error while retrieving the resource " + dataType.toString(), new RegistryException(e));
+ throw new RegistryException("Error while retrieving the resource " + dataType.toString(), e);
+ }
+ }
+
+ /**
* This method is to retrieve a specific value for a given field.
*
* @param dataType Data type is a predefined type which the programmer should choose according to the object he
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b7b128/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 3db46f1..79e3c66 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -1367,6 +1367,58 @@ public class ExperimentRegistry {
return null;
}
+ public List<ExperimentSummaryModel> searchAllAccessibleExperiments(List<String> accessibleIds, Map<String, String> filters, int limit,
+ int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
+ Map<String, String> fil = new HashMap<String, String>();
+ if (filters != null && filters.size() != 0) {
+ List<ExperimentSummaryModel> experimentSummaries = new ArrayList<>();
+ long fromTime = 0;
+ long toTime = 0;
+ try {
+ for (String field : filters.keySet()) {
+ if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_NAME)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.EXPERIMENT_NAME, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.USER_NAME)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.USER_NAME, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.PROJECT_ID)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.PROJECT_ID, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.GATEWAY_ID)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.GATEWAY_ID, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.DESCRIPTION)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.DESCRIPTION, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXECUTION_ID)) {
+ fil.put(AbstractExpCatResource.ExperimentConstants.EXECUTION_ID, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.EXPERIMENT_STATUS)) {
+ fil.put(AbstractExpCatResource.ExperimentStatusConstants.STATE, filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.FROM_DATE)) {
+ fromTime = Long.parseLong(filters.get(field));
+ } else if (field.equals(Constants.FieldConstants.ExperimentConstants.TO_DATE)) {
+ toTime = Long.parseLong(filters.get(field));
+ }
+ }
+ List<ExperimentSummaryResource> experimentSummaryResources;
+ if (fromTime != 0 && toTime != 0) {
+ experimentSummaryResources = workerResource.searchExperiments(new Timestamp(fromTime), new Timestamp(toTime), fil
+ ,limit , offset, orderByIdentifier, resultOrderType);
+ } else {
+ experimentSummaryResources = workerResource
+ .searchExperiments(null, null, fil, limit, offset, orderByIdentifier, resultOrderType);
+ }
+ if (experimentSummaryResources != null && !experimentSummaryResources.isEmpty()) {
+ for (ExperimentSummaryResource ex : experimentSummaryResources) {
+ experimentSummaries.add(ThriftDataModelConversion.getExperimentSummary(ex));
+ }
+ }
+ return experimentSummaries;
+
+ } catch (Exception e) {
+ logger.error("Error while retrieving experiment summary from registry", e);
+ throw new RegistryException(e);
+ }
+ }
+ return null;
+ }
+
public ExperimentStatistics getExperimentStatistics(Map<String,String> filters) throws RegistryException {
try {
ExperimentStatistics experimentStatistics = new ExperimentStatistics();
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b7b128/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
index ef44c64..8861b68 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ProjectRegistry.java
@@ -262,6 +262,53 @@ public class ProjectRegistry {
return null;
}
+ /**
+ * To search the projects where the user have access(owner or shared with) with the given filter criteria and retrieve the results with
+ * pagination support. Results can be ordered based on an identifier (i.e column) either ASC or
+ * DESC.
+ *
+ * @param accessibleIds
+ * @param filters
+ * @param limit
+ * @param offset
+ * @param orderByIdentifier
+ * @param resultOrderType
+ * @return
+ * @throws RegistryException
+ */
+ public List<Project> searchAllAccessibleProjects(List<String> accessibleIds, Map<String, String> filters, int limit,
+ int offset, Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
+ Map<String, String> fil = new HashMap<String, String>();
+ if (filters != null && filters.size() != 0){
+ List<Project> projects = new ArrayList<Project>();
+ try {
+ for (String field : filters.keySet()){
+ if (field.equals(Constants.FieldConstants.ProjectConstants.PROJECT_NAME)){
+ fil.put(AbstractExpCatResource.ProjectConstants.PROJECT_NAME, filters.get(field));
+ }else if (field.equals(Constants.FieldConstants.ProjectConstants.OWNER)){
+ fil.put(AbstractExpCatResource.ProjectConstants.USERNAME, filters.get(field));
+ }else if (field.equals(Constants.FieldConstants.ProjectConstants.DESCRIPTION)){
+ fil.put(AbstractExpCatResource.ProjectConstants.DESCRIPTION, filters.get(field));
+ }else if (field.equals(Constants.FieldConstants.ProjectConstants.GATEWAY_ID)){
+ fil.put(AbstractExpCatResource.ProjectConstants.GATEWAY_ID, filters.get(field));
+ }
+ }
+ List<ProjectResource> projectResources = workerResource
+ .searchProjects(fil, limit, offset, orderByIdentifier, resultOrderType);
+ if (projectResources != null && !projectResources.isEmpty()){
+ for (ProjectResource pr : projectResources){
+ projects.add(ThriftDataModelConversion.getProject(pr));
+ }
+ }
+ return projects;
+ }catch (Exception e){
+ logger.error("Error while retrieving project from registry", e);
+ throw new RegistryException(e);
+ }
+ }
+ return null;
+ }
+
public List<String> getProjectIDs (String fieldName, Object value) throws RegistryException{
List<String> projectIds = new ArrayList<String>();
try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b7b128/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
index d9df6a9..b9b5dd5 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalog.java
@@ -145,6 +145,22 @@ public interface ExperimentCatalog {
ResultOrderType resultOrderType) throws RegistryException;
/**
+ * This method search all the accessible resources given the set of ids of all accessible resource IDs.
+ * @param dataType Data type is a predefined type which the programmer should choose according to the object he
+ * is going to save in to registry
+ * @param accessibleIds list of string IDs of all accessible resources
+ * @param filters filters is a map of field name and value that you need to use for search filtration
+ * @param limit amount of the results to be returned
+ * @param offset offset of the results from the sorted list to be fetched from
+ * @param orderByIdentifier identifier (i.e the column) which will be used as the basis to sort the results
+ * @param resultOrderType The type of ordering (i.e ASC or DESC) that has to be used when retrieving the results
+ * @return List of objects according to the given criteria
+ */
+ public List<Object> searchAllAccessible(ExperimentCatalogModelType dataType,List<String> accessibleIds, Map<String, String> filters,
+ int limit, int offset, Object orderByIdentifier,
+ ResultOrderType resultOrderType) throws RegistryException;
+
+ /**
* This method is to retrieve a specific value for a given field.
* @param dataType Data type is a predefined type which the programmer should choose according to the object he
* is going to save in to registry
[11/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 621d3fb..af94943 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -548,173 +548,6 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- /**
- *
- * Search User Experiments by Name
- * Search user Experiments using experiment name with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user who created the experiments.
- *
- * @param expName
- * Experiment name to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- **/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByName(1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required string expName,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
- /**
- *
- * Search By Experiment Description
- * Search Experiments by experiment description with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @param description
- * Experiment description to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- **/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByDesc(1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required string description,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
- /**
- *
- * Search Experiment By the Application
- * Search Experiments of a particular application id with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the requested user.
- *
- * @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.
- *
- **/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByApplication(1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required string applicationId,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
- /**
- *
- * Search User Experiments by Status
- * Search all the Experiments of the given user by experiment status with pagination. Results will be sorted based on creation time DESC
- *
- * @param gatewayId
- * Unique identifier of the requested gateway.
- *
- * @param userName
- * Username of the user making the request.
- *
- * @param experimentState
- * Experiement state to be matched.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- **/
- 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,
- 5: required i32 limit,
- 6: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
- /**
- *
- * Search User Experiments by the Creation Time
- * This will search all the experiments of the given user by experiment creation time with pagination. Results will be sorted based on creation time DESC.
- *
- * @param gatewayId
- * Unique 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.
- *
- * @param limit
- * Amount of results to be fetched.
- *
- * @param offset
- * The starting point of the results to be fetched.
- *
- * @return ExperimentSummaryModel
- * List of experiments for the given search filter. Here only the Experiment summary will be returned.
- *
- **/
- list<experiment_model.ExperimentSummaryModel> searchExperimentsByCreationTime(1: required security_model.AuthzToken authzToken,
- 2: required string gatewayId,
- 3: required string userName,
- 4: required i64 fromTime,
- 5: required i64 toTime,
- 6: required i32 limit,
- 7: required i32 offset)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
/**
* Search Experiments.
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted based on creation time DESC.
[23/53] [abbrv] airavata git commit: unifying project search API
methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e9b45f/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 a2e1f31..b5d0ce3 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
@@ -7911,11 +7911,11 @@ uint32_t Airavata_getUserProjects_presult::read(::apache::thrift::protocol::TPro
}
-Airavata_searchProjectsByProjectName_args::~Airavata_searchProjectsByProjectName_args() throw() {
+Airavata_searchProjects_args::~Airavata_searchProjects_args() throw() {
}
-uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjects_args::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -7930,7 +7930,6 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
bool isset_authzToken = false;
bool isset_gatewayId = false;
bool isset_userName = false;
- bool isset_projectName = false;
bool isset_limit = false;
bool isset_offset = false;
@@ -7967,406 +7966,26 @@ uint32_t Airavata_searchProjectsByProjectName_args::read(::apache::thrift::proto
}
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;
- } 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;
- }
- xfer += iprot->readFieldEnd();
- }
-
- 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)
- 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 xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_args");
-
- 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, 3);
- 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->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();
- return xfer;
-}
-
-
-Airavata_searchProjectsByProjectName_pargs::~Airavata_searchProjectsByProjectName_pargs() throw() {
-}
-
-
-uint32_t Airavata_searchProjectsByProjectName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_pargs");
-
- 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, 3);
- 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->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();
- return xfer;
-}
-
-
-Airavata_searchProjectsByProjectName_result::~Airavata_searchProjectsByProjectName_result() throw() {
-}
-
-
-uint32_t Airavata_searchProjectsByProjectName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
{
- this->success.clear();
+ this->filters.clear();
uint32_t _size74;
- ::apache::thrift::protocol::TType _etype77;
- xfer += iprot->readListBegin(_etype77, _size74);
- this->success.resize(_size74);
+ ::apache::thrift::protocol::TType _ktype75;
+ ::apache::thrift::protocol::TType _vtype76;
+ xfer += iprot->readMapBegin(_ktype75, _vtype76, _size74);
uint32_t _i78;
for (_i78 = 0; _i78 < _size74; ++_i78)
{
- xfer += this->success[_i78].read(iprot);
+ ::apache::airavata::model::experiment::ProjectSearchFields::type _key79;
+ int32_t ecast81;
+ xfer += iprot->readI32(ecast81);
+ _key79 = ( ::apache::airavata::model::experiment::ProjectSearchFields::type)ecast81;
+ std::string& _val80 = this->filters[_key79];
+ xfer += iprot->readString(_val80);
}
- xfer += iprot->readListEnd();
- }
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_searchProjectsByProjectName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectName_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 _iter79;
- for (_iter79 = this->success.begin(); _iter79 != this->success.end(); ++_iter79)
- {
- xfer += (*_iter79).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_searchProjectsByProjectName_presult::~Airavata_searchProjectsByProjectName_presult() throw() {
-}
-
-
-uint32_t Airavata_searchProjectsByProjectName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size80;
- ::apache::thrift::protocol::TType _etype83;
- xfer += iprot->readListBegin(_etype83, _size80);
- (*(this->success)).resize(_size80);
- uint32_t _i84;
- for (_i84 = 0; _i84 < _size80; ++_i84)
- {
- xfer += (*(this->success))[_i84].read(iprot);
- }
- xfer += iprot->readListEnd();
+ xfer += iprot->readMapEnd();
}
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_searchProjectsByProjectDesc_args::~Airavata_searchProjectsByProjectDesc_args() throw() {
-}
-
-
-uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_gatewayId = false;
- bool isset_userName = false;
- bool isset_description = false;
- bool isset_limit = false;
- bool isset_offset = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->description);
- isset_description = true;
+ this->__isset.filters = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -8402,8 +8021,6 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
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)
@@ -8411,10 +8028,10 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::read(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjects_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_args");
+ xfer += oprot->writeStructBegin("Airavata_searchProjects_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -8428,8 +8045,17 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::prot
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("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::ProjectSearchFields::type, std::string> ::const_iterator _iter82;
+ for (_iter82 = this->filters.begin(); _iter82 != this->filters.end(); ++_iter82)
+ {
+ xfer += oprot->writeI32((int32_t)_iter82->first);
+ xfer += oprot->writeString(_iter82->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -8446,14 +8072,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_args::write(::apache::thrift::prot
}
-Airavata_searchProjectsByProjectDesc_pargs::~Airavata_searchProjectsByProjectDesc_pargs() throw() {
+Airavata_searchProjects_pargs::~Airavata_searchProjects_pargs() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_searchProjects_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_pargs");
+ xfer += oprot->writeStructBegin("Airavata_searchProjects_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -8467,8 +8093,17 @@ uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::pro
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("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::ProjectSearchFields::type, std::string> ::const_iterator _iter83;
+ for (_iter83 = (*(this->filters)).begin(); _iter83 != (*(this->filters)).end(); ++_iter83)
+ {
+ xfer += oprot->writeI32((int32_t)_iter83->first);
+ xfer += oprot->writeString(_iter83->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 5);
@@ -8485,11 +8120,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_pargs::write(::apache::thrift::pro
}
-Airavata_searchProjectsByProjectDesc_result::~Airavata_searchProjectsByProjectDesc_result() throw() {
+Airavata_searchProjects_result::~Airavata_searchProjects_result() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjects_result::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -8514,14 +8149,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size85;
- ::apache::thrift::protocol::TType _etype88;
- xfer += iprot->readListBegin(_etype88, _size85);
- this->success.resize(_size85);
- uint32_t _i89;
- for (_i89 = 0; _i89 < _size85; ++_i89)
+ uint32_t _size84;
+ ::apache::thrift::protocol::TType _etype87;
+ xfer += iprot->readListBegin(_etype87, _size84);
+ this->success.resize(_size84);
+ uint32_t _i88;
+ for (_i88 = 0; _i88 < _size84; ++_i88)
{
- xfer += this->success[_i89].read(iprot);
+ xfer += this->success[_i88].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8574,20 +8209,20 @@ 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_searchProjects_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_searchProjectsByProjectDesc_result");
+ xfer += oprot->writeStructBegin("Airavata_searchProjects_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 _iter90;
- for (_iter90 = this->success.begin(); _iter90 != this->success.end(); ++_iter90)
+ std::vector< ::apache::airavata::model::workspace::Project> ::const_iterator _iter89;
+ for (_iter89 = this->success.begin(); _iter89 != this->success.end(); ++_iter89)
{
- xfer += (*_iter90).write(oprot);
+ xfer += (*_iter89).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -8615,11 +8250,11 @@ uint32_t Airavata_searchProjectsByProjectDesc_result::write(::apache::thrift::pr
}
-Airavata_searchProjectsByProjectDesc_presult::~Airavata_searchProjectsByProjectDesc_presult() throw() {
+Airavata_searchProjects_presult::~Airavata_searchProjects_presult() throw() {
}
-uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_searchProjects_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
uint32_t xfer = 0;
@@ -8644,14 +8279,14 @@ uint32_t Airavata_searchProjectsByProjectDesc_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size91;
- ::apache::thrift::protocol::TType _etype94;
- xfer += iprot->readListBegin(_etype94, _size91);
- (*(this->success)).resize(_size91);
- uint32_t _i95;
- for (_i95 = 0; _i95 < _size91; ++_i95)
+ uint32_t _size90;
+ ::apache::thrift::protocol::TType _etype93;
+ xfer += iprot->readListBegin(_etype93, _size90);
+ (*(this->success)).resize(_size90);
+ uint32_t _i94;
+ for (_i94 = 0; _i94 < _size90; ++_i94)
{
- xfer += (*(this->success))[_i95].read(iprot);
+ xfer += (*(this->success))[_i94].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -8763,19 +8398,19 @@ uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->filters.clear();
- uint32_t _size96;
- ::apache::thrift::protocol::TType _ktype97;
- ::apache::thrift::protocol::TType _vtype98;
- xfer += iprot->readMapBegin(_ktype97, _vtype98, _size96);
- uint32_t _i100;
- for (_i100 = 0; _i100 < _size96; ++_i100)
+ uint32_t _size95;
+ ::apache::thrift::protocol::TType _ktype96;
+ ::apache::thrift::protocol::TType _vtype97;
+ xfer += iprot->readMapBegin(_ktype96, _vtype97, _size95);
+ uint32_t _i99;
+ for (_i99 = 0; _i99 < _size95; ++_i99)
{
- ::apache::airavata::model::experiment::ExperimentSearchFields::type _key101;
- int32_t ecast103;
- xfer += iprot->readI32(ecast103);
- _key101 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast103;
- std::string& _val102 = this->filters[_key101];
- xfer += iprot->readString(_val102);
+ ::apache::airavata::model::experiment::ExperimentSearchFields::type _key100;
+ int32_t ecast102;
+ xfer += iprot->readI32(ecast102);
+ _key100 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast102;
+ std::string& _val101 = this->filters[_key100];
+ xfer += iprot->readString(_val101);
}
xfer += iprot->readMapEnd();
}
@@ -8842,11 +8477,11 @@ uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TPro
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 _iter104;
- for (_iter104 = this->filters.begin(); _iter104 != this->filters.end(); ++_iter104)
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter103;
+ for (_iter103 = this->filters.begin(); _iter103 != this->filters.end(); ++_iter103)
{
- xfer += oprot->writeI32((int32_t)_iter104->first);
- xfer += oprot->writeString(_iter104->second);
+ xfer += oprot->writeI32((int32_t)_iter103->first);
+ xfer += oprot->writeString(_iter103->second);
}
xfer += oprot->writeMapEnd();
}
@@ -8890,11 +8525,11 @@ uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TPr
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 _iter105;
- for (_iter105 = (*(this->filters)).begin(); _iter105 != (*(this->filters)).end(); ++_iter105)
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter104;
+ for (_iter104 = (*(this->filters)).begin(); _iter104 != (*(this->filters)).end(); ++_iter104)
{
- xfer += oprot->writeI32((int32_t)_iter105->first);
- xfer += oprot->writeString(_iter105->second);
+ xfer += oprot->writeI32((int32_t)_iter104->first);
+ xfer += oprot->writeString(_iter104->second);
}
xfer += oprot->writeMapEnd();
}
@@ -8943,14 +8578,14 @@ uint32_t Airavata_searchExperiments_result::read(::apache::thrift::protocol::TPr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size106;
- ::apache::thrift::protocol::TType _etype109;
- xfer += iprot->readListBegin(_etype109, _size106);
- this->success.resize(_size106);
- uint32_t _i110;
- for (_i110 = 0; _i110 < _size106; ++_i110)
+ uint32_t _size105;
+ ::apache::thrift::protocol::TType _etype108;
+ xfer += iprot->readListBegin(_etype108, _size105);
+ this->success.resize(_size105);
+ uint32_t _i109;
+ for (_i109 = 0; _i109 < _size105; ++_i109)
{
- xfer += this->success[_i110].read(iprot);
+ xfer += this->success[_i109].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9013,10 +8648,10 @@ uint32_t Airavata_searchExperiments_result::write(::apache::thrift::protocol::TP
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 _iter111;
- for (_iter111 = this->success.begin(); _iter111 != this->success.end(); ++_iter111)
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter110;
+ for (_iter110 = this->success.begin(); _iter110 != this->success.end(); ++_iter110)
{
- xfer += (*_iter111).write(oprot);
+ xfer += (*_iter110).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9073,14 +8708,14 @@ uint32_t Airavata_searchExperiments_presult::read(::apache::thrift::protocol::TP
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size112;
- ::apache::thrift::protocol::TType _etype115;
- xfer += iprot->readListBegin(_etype115, _size112);
- (*(this->success)).resize(_size112);
- uint32_t _i116;
- for (_i116 = 0; _i116 < _size112; ++_i116)
+ uint32_t _size111;
+ ::apache::thrift::protocol::TType _etype114;
+ xfer += iprot->readListBegin(_etype114, _size111);
+ (*(this->success)).resize(_size111);
+ uint32_t _i115;
+ for (_i115 = 0; _i115 < _size111; ++_i115)
{
- xfer += (*(this->success))[_i116].read(iprot);
+ xfer += (*(this->success))[_i115].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9629,14 +9264,14 @@ uint32_t Airavata_getExperimentsInProject_result::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size117;
- ::apache::thrift::protocol::TType _etype120;
- xfer += iprot->readListBegin(_etype120, _size117);
- this->success.resize(_size117);
- uint32_t _i121;
- for (_i121 = 0; _i121 < _size117; ++_i121)
+ uint32_t _size116;
+ ::apache::thrift::protocol::TType _etype119;
+ xfer += iprot->readListBegin(_etype119, _size116);
+ this->success.resize(_size116);
+ uint32_t _i120;
+ for (_i120 = 0; _i120 < _size116; ++_i120)
{
- xfer += this->success[_i121].read(iprot);
+ xfer += this->success[_i120].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -9707,10 +9342,10 @@ uint32_t Airavata_getExperimentsInProject_result::write(::apache::thrift::protoc
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::ExperimentModel> ::const_iterator _iter122;
- for (_iter122 = this->success.begin(); _iter122 != this->success.end(); ++_iter122)
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter121;
+ for (_iter121 = this->success.begin(); _iter121 != this->success.end(); ++_iter121)
{
- xfer += (*_iter122).write(oprot);
+ xfer += (*_iter121).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -9771,14 +9406,14 @@ uint32_t Airavata_getExperimentsInProject_presult::read(::apache::thrift::protoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size123;
- ::apache::thrift::protocol::TType _etype126;
- xfer += iprot->readListBegin(_etype126, _size123);
- (*(this->success)).resize(_size123);
- uint32_t _i127;
- for (_i127 = 0; _i127 < _size123; ++_i127)
+ uint32_t _size122;
+ ::apache::thrift::protocol::TType _etype125;
+ xfer += iprot->readListBegin(_etype125, _size122);
+ (*(this->success)).resize(_size122);
+ uint32_t _i126;
+ for (_i126 = 0; _i126 < _size122; ++_i126)
{
- xfer += (*(this->success))[_i127].read(iprot);
+ xfer += (*(this->success))[_i126].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -10027,14 +9662,14 @@ uint32_t Airavata_getUserExperiments_result::read(::apache::thrift::protocol::TP
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size128;
- ::apache::thrift::protocol::TType _etype131;
- xfer += iprot->readListBegin(_etype131, _size128);
- this->success.resize(_size128);
- uint32_t _i132;
- for (_i132 = 0; _i132 < _size128; ++_i132)
+ uint32_t _size127;
+ ::apache::thrift::protocol::TType _etype130;
+ xfer += iprot->readListBegin(_etype130, _size127);
+ this->success.resize(_size127);
+ uint32_t _i131;
+ for (_i131 = 0; _i131 < _size127; ++_i131)
{
- xfer += this->success[_i132].read(iprot);
+ xfer += this->success[_i131].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -10097,10 +9732,10 @@ uint32_t Airavata_getUserExperiments_result::write(::apache::thrift::protocol::T
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::ExperimentModel> ::const_iterator _iter133;
- for (_iter133 = this->success.begin(); _iter133 != this->success.end(); ++_iter133)
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter132;
+ for (_iter132 = this->success.begin(); _iter132 != this->success.end(); ++_iter132)
{
- xfer += (*_iter133).write(oprot);
+ xfer += (*_iter132).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -10157,14 +9792,14 @@ uint32_t Airavata_getUserExperiments_presult::read(::apache::thrift::protocol::T
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size134;
- ::apache::thrift::protocol::TType _etype137;
- xfer += iprot->readListBegin(_etype137, _size134);
- (*(this->success)).resize(_size134);
- uint32_t _i138;
- for (_i138 = 0; _i138 < _size134; ++_i138)
+ uint32_t _size133;
+ ::apache::thrift::protocol::TType _etype136;
+ xfer += iprot->readListBegin(_etype136, _size133);
+ (*(this->success)).resize(_size133);
+ uint32_t _i137;
+ for (_i137 = 0; _i137 < _size133; ++_i137)
{
- xfer += (*(this->success))[_i138].read(iprot);
+ xfer += (*(this->success))[_i137].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -13253,14 +12888,14 @@ uint32_t Airavata_getExperimentOutputs_result::read(::apache::thrift::protocol::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size139;
- ::apache::thrift::protocol::TType _etype142;
- xfer += iprot->readListBegin(_etype142, _size139);
- this->success.resize(_size139);
- uint32_t _i143;
- for (_i143 = 0; _i143 < _size139; ++_i143)
+ uint32_t _size138;
+ ::apache::thrift::protocol::TType _etype141;
+ xfer += iprot->readListBegin(_etype141, _size138);
+ this->success.resize(_size138);
+ uint32_t _i142;
+ for (_i142 = 0; _i142 < _size138; ++_i142)
{
- xfer += this->success[_i143].read(iprot);
+ xfer += this->success[_i142].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -13331,10 +12966,10 @@ uint32_t Airavata_getExperimentOutputs_result::write(::apache::thrift::protocol:
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::application::io::OutputDataObjectType> ::const_iterator _iter144;
- for (_iter144 = this->success.begin(); _iter144 != this->success.end(); ++_iter144)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter143;
+ for (_iter143 = this->success.begin(); _iter143 != this->success.end(); ++_iter143)
{
- xfer += (*_iter144).write(oprot);
+ xfer += (*_iter143).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -13395,14 +13030,14 @@ uint32_t Airavata_getExperimentOutputs_presult::read(::apache::thrift::protocol:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size145;
- ::apache::thrift::protocol::TType _etype148;
- xfer += iprot->readListBegin(_etype148, _size145);
- (*(this->success)).resize(_size145);
- uint32_t _i149;
- for (_i149 = 0; _i149 < _size145; ++_i149)
+ uint32_t _size144;
+ ::apache::thrift::protocol::TType _etype147;
+ xfer += iprot->readListBegin(_etype147, _size144);
+ (*(this->success)).resize(_size144);
+ uint32_t _i148;
+ for (_i148 = 0; _i148 < _size144; ++_i148)
{
- xfer += (*(this->success))[_i149].read(iprot);
+ xfer += (*(this->success))[_i148].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -13594,14 +13229,14 @@ uint32_t Airavata_getIntermediateOutputs_result::read(::apache::thrift::protocol
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size150;
- ::apache::thrift::protocol::TType _etype153;
- xfer += iprot->readListBegin(_etype153, _size150);
- this->success.resize(_size150);
- uint32_t _i154;
- for (_i154 = 0; _i154 < _size150; ++_i154)
+ uint32_t _size149;
+ ::apache::thrift::protocol::TType _etype152;
+ xfer += iprot->readListBegin(_etype152, _size149);
+ this->success.resize(_size149);
+ uint32_t _i153;
+ for (_i153 = 0; _i153 < _size149; ++_i153)
{
- xfer += this->success[_i154].read(iprot);
+ xfer += this->success[_i153].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -13672,10 +13307,10 @@ uint32_t Airavata_getIntermediateOutputs_result::write(::apache::thrift::protoco
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::application::io::OutputDataObjectType> ::const_iterator _iter155;
- for (_iter155 = this->success.begin(); _iter155 != this->success.end(); ++_iter155)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter154;
+ for (_iter154 = this->success.begin(); _iter154 != this->success.end(); ++_iter154)
{
- xfer += (*_iter155).write(oprot);
+ xfer += (*_iter154).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -13736,14 +13371,14 @@ uint32_t Airavata_getIntermediateOutputs_presult::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size156;
- ::apache::thrift::protocol::TType _etype159;
- xfer += iprot->readListBegin(_etype159, _size156);
- (*(this->success)).resize(_size156);
- uint32_t _i160;
- for (_i160 = 0; _i160 < _size156; ++_i160)
+ uint32_t _size155;
+ ::apache::thrift::protocol::TType _etype158;
+ xfer += iprot->readListBegin(_etype158, _size155);
+ (*(this->success)).resize(_size155);
+ uint32_t _i159;
+ for (_i159 = 0; _i159 < _size155; ++_i159)
{
- xfer += (*(this->success))[_i160].read(iprot);
+ xfer += (*(this->success))[_i159].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -13935,17 +13570,17 @@ uint32_t Airavata_getJobStatuses_result::read(::apache::thrift::protocol::TProto
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size161;
- ::apache::thrift::protocol::TType _ktype162;
- ::apache::thrift::protocol::TType _vtype163;
- xfer += iprot->readMapBegin(_ktype162, _vtype163, _size161);
- uint32_t _i165;
- for (_i165 = 0; _i165 < _size161; ++_i165)
+ uint32_t _size160;
+ ::apache::thrift::protocol::TType _ktype161;
+ ::apache::thrift::protocol::TType _vtype162;
+ xfer += iprot->readMapBegin(_ktype161, _vtype162, _size160);
+ uint32_t _i164;
+ for (_i164 = 0; _i164 < _size160; ++_i164)
{
- std::string _key166;
- xfer += iprot->readString(_key166);
- ::apache::airavata::model::status::JobStatus& _val167 = this->success[_key166];
- xfer += _val167.read(iprot);
+ std::string _key165;
+ xfer += iprot->readString(_key165);
+ ::apache::airavata::model::status::JobStatus& _val166 = this->success[_key165];
+ xfer += _val166.read(iprot);
}
xfer += iprot->readMapEnd();
}
@@ -14016,11 +13651,11 @@ uint32_t Airavata_getJobStatuses_result::write(::apache::thrift::protocol::TProt
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, ::apache::airavata::model::status::JobStatus> ::const_iterator _iter168;
- for (_iter168 = this->success.begin(); _iter168 != this->success.end(); ++_iter168)
+ std::map<std::string, ::apache::airavata::model::status::JobStatus> ::const_iterator _iter167;
+ for (_iter167 = this->success.begin(); _iter167 != this->success.end(); ++_iter167)
{
- xfer += oprot->writeString(_iter168->first);
- xfer += _iter168->second.write(oprot);
+ xfer += oprot->writeString(_iter167->first);
+ xfer += _iter167->second.write(oprot);
}
xfer += oprot->writeMapEnd();
}
@@ -14081,17 +13716,17 @@ uint32_t Airavata_getJobStatuses_presult::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size169;
- ::apache::thrift::protocol::TType _ktype170;
- ::apache::thrift::protocol::TType _vtype171;
- xfer += iprot->readMapBegin(_ktype170, _vtype171, _size169);
- uint32_t _i173;
- for (_i173 = 0; _i173 < _size169; ++_i173)
+ uint32_t _size168;
+ ::apache::thrift::protocol::TType _ktype169;
+ ::apache::thrift::protocol::TType _vtype170;
+ xfer += iprot->readMapBegin(_ktype169, _vtype170, _size168);
+ uint32_t _i172;
+ for (_i172 = 0; _i172 < _size168; ++_i172)
{
- std::string _key174;
- xfer += iprot->readString(_key174);
- ::apache::airavata::model::status::JobStatus& _val175 = (*(this->success))[_key174];
- xfer += _val175.read(iprot);
+ std::string _key173;
+ xfer += iprot->readString(_key173);
+ ::apache::airavata::model::status::JobStatus& _val174 = (*(this->success))[_key173];
+ xfer += _val174.read(iprot);
}
xfer += iprot->readMapEnd();
}
@@ -14283,14 +13918,14 @@ uint32_t Airavata_getJobDetails_result::read(::apache::thrift::protocol::TProtoc
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size176;
- ::apache::thrift::protocol::TType _etype179;
- xfer += iprot->readListBegin(_etype179, _size176);
- this->success.resize(_size176);
- uint32_t _i180;
- for (_i180 = 0; _i180 < _size176; ++_i180)
+ uint32_t _size175;
+ ::apache::thrift::protocol::TType _etype178;
+ xfer += iprot->readListBegin(_etype178, _size175);
+ this->success.resize(_size175);
+ uint32_t _i179;
+ for (_i179 = 0; _i179 < _size175; ++_i179)
{
- xfer += this->success[_i180].read(iprot);
+ xfer += this->success[_i179].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -14361,10 +13996,10 @@ uint32_t Airavata_getJobDetails_result::write(::apache::thrift::protocol::TProto
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::job::JobModel> ::const_iterator _iter181;
- for (_iter181 = this->success.begin(); _iter181 != this->success.end(); ++_iter181)
+ std::vector< ::apache::airavata::model::job::JobModel> ::const_iterator _iter180;
+ for (_iter180 = this->success.begin(); _iter180 != this->success.end(); ++_iter180)
{
- xfer += (*_iter181).write(oprot);
+ xfer += (*_iter180).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -14425,14 +14060,14 @@ uint32_t Airavata_getJobDetails_presult::read(::apache::thrift::protocol::TProto
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size182;
- ::apache::thrift::protocol::TType _etype185;
- xfer += iprot->readListBegin(_etype185, _size182);
- (*(this->success)).resize(_size182);
- uint32_t _i186;
- for (_i186 = 0; _i186 < _size182; ++_i186)
+ uint32_t _size181;
+ ::apache::thrift::protocol::TType _etype184;
+ xfer += iprot->readListBegin(_etype184, _size181);
+ (*(this->success)).resize(_size181);
+ uint32_t _i185;
+ for (_i185 = 0; _i185 < _size181; ++_i185)
{
- xfer += (*(this->success))[_i186].read(iprot);
+ xfer += (*(this->success))[_i185].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -16153,14 +15788,14 @@ uint32_t Airavata_getAllAppModules_result::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size187;
- ::apache::thrift::protocol::TType _etype190;
- xfer += iprot->readListBegin(_etype190, _size187);
- this->success.resize(_size187);
- uint32_t _i191;
- for (_i191 = 0; _i191 < _size187; ++_i191)
+ uint32_t _size186;
+ ::apache::thrift::protocol::TType _etype189;
+ xfer += iprot->readListBegin(_etype189, _size186);
+ this->success.resize(_size186);
+ uint32_t _i190;
+ for (_i190 = 0; _i190 < _size186; ++_i190)
{
- xfer += this->success[_i191].read(iprot);
+ xfer += this->success[_i190].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -16223,10 +15858,10 @@ uint32_t Airavata_getAllAppModules_result::write(::apache::thrift::protocol::TPr
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::appcatalog::appdeployment::ApplicationModule> ::const_iterator _iter192;
- for (_iter192 = this->success.begin(); _iter192 != this->success.end(); ++_iter192)
+ std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule> ::const_iterator _iter191;
+ for (_iter191 = this->success.begin(); _iter191 != this->success.end(); ++_iter191)
{
- xfer += (*_iter192).write(oprot);
+ xfer += (*_iter191).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -16283,14 +15918,14 @@ uint32_t Airavata_getAllAppModules_presult::read(::apache::thrift::protocol::TPr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size193;
- ::apache::thrift::protocol::TType _etype196;
- xfer += iprot->readListBegin(_etype196, _size193);
- (*(this->success)).resize(_size193);
- uint32_t _i197;
- for (_i197 = 0; _i197 < _size193; ++_i197)
+ uint32_t _size192;
+ ::apache::thrift::protocol::TType _etype195;
+ xfer += iprot->readListBegin(_etype195, _size192);
+ (*(this->success)).resize(_size192);
+ uint32_t _i196;
+ for (_i196 = 0; _i196 < _size192; ++_i196)
{
- xfer += (*(this->success))[_i197].read(iprot);
+ xfer += (*(this->success))[_i196].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -17957,14 +17592,14 @@ uint32_t Airavata_getAllApplicationDeployments_result::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size198;
- ::apache::thrift::protocol::TType _etype201;
- xfer += iprot->readListBegin(_etype201, _size198);
- this->success.resize(_size198);
- uint32_t _i202;
- for (_i202 = 0; _i202 < _size198; ++_i202)
+ uint32_t _size197;
+ ::apache::thrift::protocol::TType _etype200;
+ xfer += iprot->readListBegin(_etype200, _size197);
+ this->success.resize(_size197);
+ uint32_t _i201;
+ for (_i201 = 0; _i201 < _size197; ++_i201)
{
- xfer += this->success[_i202].read(iprot);
+ xfer += this->success[_i201].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -18027,10 +17662,10 @@ uint32_t Airavata_getAllApplicationDeployments_result::write(::apache::thrift::p
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::appcatalog::appdeployment::ApplicationDeploymentDescription> ::const_iterator _iter203;
- for (_iter203 = this->success.begin(); _iter203 != this->success.end(); ++_iter203)
+ std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription> ::const_iterator _iter202;
+ for (_iter202 = this->success.begin(); _iter202 != this->success.end(); ++_iter202)
{
- xfer += (*_iter203).write(oprot);
+ xfer += (*_iter202).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -18087,14 +17722,14 @@ uint32_t Airavata_getAllApplicationDeployments_presult::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size204;
- ::apache::thrift::protocol::TType _etype207;
- xfer += iprot->readListBegin(_etype207, _size204);
- (*(this->success)).resize(_size204);
- uint32_t _i208;
- for (_i208 = 0; _i208 < _size204; ++_i208)
+ uint32_t _size203;
+ ::apache::thrift::protocol::TType _etype206;
+ xfer += iprot->readListBegin(_etype206, _size203);
+ (*(this->success)).resize(_size203);
+ uint32_t _i207;
+ for (_i207 = 0; _i207 < _size203; ++_i207)
{
- xfer += (*(this->success))[_i208].read(iprot);
+ xfer += (*(this->success))[_i207].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -18278,14 +17913,14 @@ uint32_t Airavata_getAppModuleDeployedResources_result::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size209;
- ::apache::thrift::protocol::TType _etype212;
- xfer += iprot->readListBegin(_etype212, _size209);
- this->success.resize(_size209);
- uint32_t _i213;
- for (_i213 = 0; _i213 < _size209; ++_i213)
+ uint32_t _size208;
+ ::apache::thrift::protocol::TType _etype211;
+ xfer += iprot->readListBegin(_etype211, _size208);
+ this->success.resize(_size208);
+ uint32_t _i212;
+ for (_i212 = 0; _i212 < _size208; ++_i212)
{
- xfer += iprot->readString(this->success[_i213]);
+ xfer += iprot->readString(this->success[_i212]);
}
xfer += iprot->readListEnd();
}
@@ -18348,10 +17983,10 @@ uint32_t Airavata_getAppModuleDeployedResources_result::write(::apache::thrift::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::vector<std::string> ::const_iterator _iter214;
- for (_iter214 = this->success.begin(); _iter214 != this->success.end(); ++_iter214)
+ std::vector<std::string> ::const_iterator _iter213;
+ for (_iter213 = this->success.begin(); _iter213 != this->success.end(); ++_iter213)
{
- xfer += oprot->writeString((*_iter214));
+ xfer += oprot->writeString((*_iter213));
}
xfer += oprot->writeListEnd();
}
@@ -18408,14 +18043,14 @@ uint32_t Airavata_getAppModuleDeployedResources_presult::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size215;
- ::apache::thrift::protocol::TType _etype218;
- xfer += iprot->readListBegin(_etype218, _size215);
- (*(this->success)).resize(_size215);
- uint32_t _i219;
- for (_i219 = 0; _i219 < _size215; ++_i219)
+ uint32_t _size214;
+ ::apache::thrift::protocol::TType _etype217;
+ xfer += iprot->readListBegin(_etype217, _size214);
+ (*(this->success)).resize(_size214);
+ uint32_t _i218;
+ for (_i218 = 0; _i218 < _size214; ++_i218)
{
- xfer += iprot->readString((*(this->success))[_i219]);
+ xfer += iprot->readString((*(this->success))[_i218]);
}
xfer += iprot->readListEnd();
}
@@ -20111,17 +19746,17 @@ uint32_t Airavata_getAllApplicationInterfaceNames_result::read(::apache::thrift:
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size220;
- ::apache::thrift::protocol::TType _ktype221;
- ::apache::thrift::protocol::TType _vtype222;
- xfer += iprot->readMapBegin(_ktype221, _vtype222, _size220);
- uint32_t _i224;
- for (_i224 = 0; _i224 < _size220; ++_i224)
+ uint32_t _size219;
+ ::apache::thrift::protocol::TType _ktype220;
+ ::apache::thrift::protocol::TType _vtype221;
+ xfer += iprot->readMapBegin(_ktype220, _vtype221, _size219);
+ uint32_t _i223;
+ for (_i223 = 0; _i223 < _size219; ++_i223)
{
- std::string _key225;
- xfer += iprot->readString(_key225);
- std::string& _val226 = this->success[_key225];
- xfer += iprot->readString(_val226);
+ std::string _key224;
+ xfer += iprot->readString(_key224);
+ std::string& _val225 = this->success[_key224];
+ xfer += iprot->readString(_val225);
}
xfer += iprot->readMapEnd();
}
@@ -20184,11 +19819,11 @@ uint32_t Airavata_getAllApplicationInterfaceNames_result::write(::apache::thrift
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter227;
- for (_iter227 = this->success.begin(); _iter227 != this->success.end(); ++_iter227)
+ std::map<std::string, std::string> ::const_iterator _iter226;
+ for (_iter226 = this->success.begin(); _iter226 != this->success.end(); ++_iter226)
{
- xfer += oprot->writeString(_iter227->first);
- xfer += oprot->writeString(_iter227->second);
+ xfer += oprot->writeString(_iter226->first);
+ xfer += oprot->writeString(_iter226->second);
}
xfer += oprot->writeMapEnd();
}
@@ -20245,17 +19880,17 @@ uint32_t Airavata_getAllApplicationInterfaceNames_presult::read(::apache::thrift
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size228;
- ::apache::thrift::protocol::TType _ktype229;
- ::apache::thrift::protocol::TType _vtype230;
- xfer += iprot->readMapBegin(_ktype229, _vtype230, _size228);
- uint32_t _i232;
- for (_i232 = 0; _i232 < _size228; ++_i232)
+ uint32_t _size227;
+ ::apache::thrift::protocol::TType _ktype228;
+ ::apache::thrift::protocol::TType _vtype229;
+ xfer += iprot->readMapBegin(_ktype228, _vtype229, _size227);
+ uint32_t _i231;
+ for (_i231 = 0; _i231 < _size227; ++_i231)
{
- std::string _key233;
- xfer += iprot->readString(_key233);
- std::string& _val234 = (*(this->success))[_key233];
- xfer += iprot->readString(_val234);
+ std::string _key232;
+ xfer += iprot->readString(_key232);
+ std::string& _val233 = (*(this->success))[_key232];
+ xfer += iprot->readString(_val233);
}
xfer += iprot->readMapEnd();
}
@@ -20439,14 +20074,14 @@ uint32_t Airavata_getAllApplicationInterfaces_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size235;
- ::apache::thrift::protocol::TType _etype238;
- xfer += iprot->readListBegin(_etype238, _size235);
- this->success.resize(_size235);
- uint32_t _i239;
- for (_i239 = 0; _i239 < _size235; ++_i239)
+ uint32_t _size234;
+ ::apache::thrift::protocol::TType _etype237;
+ xfer += iprot->readListBegin(_etype237, _size234);
+ this->success.resize(_size234);
+ uint32_t _i238;
+ for (_i238 = 0; _i238 < _size234; ++_i238)
{
- xfer += this->success[_i239].read(iprot);
+ xfer += this->success[_i238].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -20509,10 +20144,10 @@ uint32_t Airavata_getAllApplicationInterfaces_result::write(::apache::thrift::pr
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::appcatalog::appinterface::ApplicationInterfaceDescription> ::const_iterator _iter240;
- for (_iter240 = this->success.begin(); _iter240 != this->success.end(); ++_iter240)
+ std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> ::const_iterator _iter239;
+ for (_iter239 = this->success.begin(); _iter239 != this->success.end(); ++_iter239)
{
- xfer += (*_iter240).write(oprot);
+ xfer += (*_iter239).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -20569,14 +20204,14 @@ uint32_t Airavata_getAllApplicationInterfaces_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size241;
- ::apache::thrift::protocol::TType _etype244;
- xfer += iprot->readListBegin(_etype244, _size241);
- (*(this->success)).resize(_size241);
- uint32_t _i245;
- for (_i245 = 0; _i245 < _size241; ++_i245)
+ uint32_t _size240;
+ ::apache::thrift::protocol::TType _etype243;
+ xfer += iprot->readListBegin(_etype243, _size240);
+ (*(this->success)).resize(_size240);
+ uint32_t _i244;
+ for (_i244 = 0; _i244 < _size240; ++_i244)
{
- xfer += (*(this->success))[_i245].read(iprot);
+ xfer += (*(this->success))[_i244].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -20760,14 +20395,14 @@ uint32_t Airavata_getApplicationInputs_result::read(::apache::thrift::protocol::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size246;
- ::apache::thrift::protocol::TType _etype249;
- xfer += iprot->readListBegin(_etype249, _size246);
- this->success.resize(_size246);
- uint32_t _i250;
- for (_i250 = 0; _i250 < _size246; ++_i250)
+ uint32_t _size245;
+ ::apache::thrift::protocol::TType _etype248;
+ xfer += iprot->readListBegin(_etype248, _size245);
+ this->success.resize(_size245);
+ uint32_t _i249;
+ for (_i249 = 0; _i249 < _size245; ++_i249)
{
- xfer += this->success[_i250].read(iprot);
+ xfer += this->success[_i249].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -20830,10 +20465,10 @@ uint32_t Airavata_getApplicationInputs_result::write(::apache::thrift::protocol:
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::application::io::InputDataObjectType> ::const_iterator _iter251;
- for (_iter251 = this->success.begin(); _iter251 != this->success.end(); ++_iter251)
+ std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter250;
+ for (_iter250 = this->success.begin(); _iter250 != this->success.end(); ++_iter250)
{
- xfer += (*_iter251).write(oprot);
+ xfer += (*_iter250).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -20890,14 +20525,14 @@ uint32_t Airavata_getApplicationInputs_presult::read(::apache::thrift::protocol:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size252;
- ::apache::thrift::protocol::TType _etype255;
- xfer += iprot->readListBegin(_etype255, _size252);
- (*(this->success)).resize(_size252);
- uint32_t _i256;
- for (_i256 = 0; _i256 < _size252; ++_i256)
+ uint32_t _size251;
+ ::apache::thrift::protocol::TType _etype254;
+ xfer += iprot->readListBegin(_etype254, _size251);
+ (*(this->success)).resize(_size251);
+ uint32_t _i255;
+ for (_i255 = 0; _i255 < _size251; ++_i255)
{
- xfer += (*(this->success))[_i256].read(iprot);
+ xfer += (*(this->success))[_i255].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -21081,14 +20716,14 @@ uint32_t Airavata_getApplicationOutputs_result::read(::apache::thrift::protocol:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size257;
- ::apache::thrift::protocol::TType _etype260;
- xfer += iprot->readListBegin(_etype260, _size257);
- this->success.resize(_size257);
- uint32_t _i261;
- for (_i261 = 0; _i261 < _size257; ++_i261)
+ uint32_t _size256;
+ ::apache::thrift::protocol::TType _etype259;
+ xfer += iprot->readListBegin(_etype259, _size256);
+ this->success.resize(_size256);
+ uint32_t _i260;
+ for (_i260 = 0; _i260 < _size256; ++_i260)
{
- xfer += this->success[_i261].read(iprot);
+ xfer += this->success[_i260].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -21151,10 +20786,10 @@ uint32_t Airavata_getApplicationOutputs_result::write(::apache::thrift::protocol
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::application::io::OutputDataObjectType> ::const_iterator _iter262;
- for (_iter262 = this->success.begin(); _iter262 != this->success.end(); ++_iter262)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter261;
+ for (_iter261 = this->success.begin(); _iter261 != this->success.end(); ++_iter261)
{
- xfer += (*_iter262).write(oprot);
+ xfer += (*_iter261).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -21211,14 +20846,14 @@ uint32_t Airavata_getApplicationOutputs_presult::read(::apache::thrift::protocol
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size263;
- ::apache::thrift::protocol::TType _etype266;
- xfer += iprot->readListBegin(_etype266, _size263);
- (*(this->success)).resize(_size263);
- uint32_t _i267;
- for (_i267 = 0; _i267 < _size263; ++_i267)
+ uint32_t _size262;
+ ::apache::thrift::protocol::TType _etype265;
+ xfer += iprot->readListBegin(_etype265, _size262);
+ (*(this->success)).resize(_size262);
+ uint32_t _i266;
+ for (_i266 = 0; _i266 < _size262; ++_i266)
{
- xfer += (*(this->success))[_i267].read(iprot);
+ xfer += (*(this->success))[_i266].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -21402,17 +21037,17 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_result::read(::apache
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size268;
- ::apache::thrift::protocol::TType _ktype269;
- ::apache::thrift::protocol::TType _vtype270;
- xfer += iprot->readMapBegin(_ktype269, _vtype270, _size268);
- uint32_t _i272;
- for (_i272 = 0; _i272 < _size268; ++_i272)
+ uint32_t _size267;
+ ::apache::thrift::protocol::TType _ktype268;
+ ::apache::thrift::protocol::TType _vtype269;
+ xfer += iprot->readMapBegin(_ktype268, _vtype269, _size267);
+ uint32_t _i271;
+ for (_i271 = 0; _i271 < _size267; ++_i271)
{
- std::string _key273;
- xfer += iprot->readString(_key273);
- std::string& _val274 = this->success[_key273];
- xfer += iprot->readString(_val274);
+ std::string _key272;
+ xfer += iprot->readString(_key272);
+ std::string& _val273 = this->success[_key272];
+ xfer += iprot->readString(_val273);
}
xfer += iprot->readMapEnd();
}
@@ -21475,11 +21110,11 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_result::write(::apach
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter275;
- for (_iter275 = this->success.begin(); _iter275 != this->success.end(); ++_iter275)
+ std::map<std::string, std::string> ::const_iterator _iter274;
+ for (_iter274 = this->success.begin(); _iter274 != this->success.end(); ++_iter274)
{
- xfer += oprot->writeString(_iter275->first);
- xfer += oprot->writeString(_iter275->second);
+ xfer += oprot->writeString(_iter274->first);
+ xfer += oprot->writeString(_iter274->second);
}
xfer += oprot->writeMapEnd();
}
@@ -21536,17 +21171,17 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_presult::read(::apach
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size276;
- ::apache::thrift::protocol::TType _ktype277;
- ::apache::thrift::protocol::TType _vtype278;
- xfer += iprot->readMapBegin(_ktype277, _vtype278, _size276);
- uint32_t _i280;
- for (_i280 = 0; _i280 < _size276; ++_i280)
+ uint32_t _size275;
+ ::apache::thrift::protocol::TType _ktype276;
+ ::apache::thrift::protocol::TType _vtype277;
+ xfer += iprot->readMapBegin(_ktype276, _vtype277, _size275);
+ uint32_t _i279;
+ for (_i279 = 0; _i279 < _size275; ++_i279)
{
- std::string _key281;
- xfer += iprot->readString(_key281);
- std::string& _val282 = (*(this->success))[_key281];
- xfer += iprot->readString(_val282);
+ std::string _key280;
+ xfer += iprot->readString(_key280);
+ std::string& _val281 = (*(this->success))[_key280];
+ xfer += iprot->readString(_val281);
}
xfer += iprot->readMapEnd();
}
@@ -22289,17 +21924,17 @@ uint32_t Airavata_getAllComputeResourceNames_result::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size283;
- ::apache::thrift::protocol::TType _ktype284;
- ::apache::thrift::protocol::TType _vtype285;
- xfer += iprot->readMapBegin(_ktype284, _vtype285, _size283);
- uint32_t _i287;
- for (_i287 = 0; _i287 < _size283; ++_i287)
+ uint32_t _size282;
+ ::apache::thrift::protocol::TType _ktype283;
+ ::apache::thrift::protocol::TType _vtype284;
+ xfer += iprot->readMapBegin(_ktype283, _vtype284, _size282);
+ uint32_t _i286;
+ for (_i286 = 0; _i286 < _size282; ++_i286)
{
- std::string _key288;
- xfer += iprot->readString(_key288);
- std::string& _val289 = this->success[_key288];
- xfer += iprot->readString(_val289);
+ std::string _key287;
+ xfer += iprot->readString(_key287);
+ std::string& _val288 = this->success[_key287];
+ xfer += iprot->readString(_val288);
}
xfer += iprot->readMapEnd();
}
@@ -22362,11 +21997,11 @@ uint32_t Airavata_getAllComputeResourceNames_result::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter290;
- for (_iter290 = this->success.begin(); _iter290 != this->success.end(); ++_iter290)
+ std::map<std::string, std::string> ::const_iterator _iter289;
+ for (_iter289 = this->success.begin(); _iter289 != this->success.end(); ++_iter289)
{
- xfer += oprot->writeString(_iter290->first);
- xfer += oprot->writeString(_iter290->second);
+ xfer += oprot->writeString(_iter289->first);
+ xfer += oprot->writeString(_iter289->second);
}
xfer += oprot->writeMapEnd();
}
@@ -22423,17 +22058,17 @@ uint32_t Airavata_getAllComputeResourceNames_presult::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size291;
- ::apache::thrift::protocol::TType _ktype292;
- ::apache::thrift::protocol::TType _vtype293;
- xfer += iprot->readMapBegin(_ktype292, _vtype293, _size291);
- uint32_t _i295;
- for (_i295 = 0; _i295 < _size291; ++_i295)
+ uint32_t _size290;
+ ::apache::thrift::protocol::TType _ktype291;
+ ::apache::thrift::protocol::TType _vtype292;
+ xfer += iprot->readMapBegin(_ktype291, _vtype292, _size290);
+ uint32_t _i294;
+ for (_i294 = 0; _i294 < _size290; ++_i294)
{
- std::string _key296;
- xfer += iprot->readString(_key296);
- std::string& _val297 = (*(this->success))[_key296];
- xfer += iprot->readString(_val297);
+ std::string _key295;
+ xfer += iprot->readString(_key295);
+ std::string& _val296 = (*(this->success))[_key295];
+ xfer += iprot->readString(_val296);
}
xfer += iprot->readMapEnd();
}
@@ -23773,17 +23408,17 @@ uint32_t Airavata_getAllStorageResourceNames_result::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size298;
- ::apache::thrift::protocol::TType _ktype299;
- ::apache::thrift::protocol::TType _vtype300;
- xfer += iprot->readMapBegin(_ktype299, _vtype300, _size298);
- uint32_t _i302;
- for (_i302 = 0; _i302 < _size298; ++_i302)
+ uint32_t _size297;
+ ::apache::thrift::protocol::TType _ktype298;
+ ::apache::thrift::protocol::TType _vtype299;
+ xfer += iprot->readMapBegin(_ktype298, _vtype299, _size297);
+ uint32_t _i301;
+ for (_i301 = 0; _i301 < _size297; ++_i301)
{
- std::string _key303;
- xfer += iprot->readString(_key303);
- std::string& _val304 = this->success[_key303];
- xfer += iprot->readString(_val304);
+ std::string _key302;
+ xfer += iprot->readString(_key302);
+ std::string& _val303 = this->success[_key302];
+ xfer += iprot->readString(_val303);
}
xfer += iprot->readMapEnd();
}
@@ -23846,11 +23481,11 @@ uint32_t Airavata_getAllStorageResourceNames_result::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter305;
- for (_iter305 = this->success.begin(); _iter305 != this->success.end(); ++_iter305)
+ std::map<std::string, std::string> ::const_iterator _iter304;
+ for (_iter304 = this->success.begin(); _iter304 != this->success.end(); ++_iter304)
{
- xfer += oprot->writeString(_iter305->first);
- xfer += oprot->writeString(_iter305->second);
+ xfer += oprot->writeString(_iter304->first);
+ xfer += oprot->writeString(_iter304->second);
}
xfer += oprot->writeMapEnd();
}
@@ -23907,17 +23542,17 @@ uint32_t Airavata_getAllStorageResourceNames_presult::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size306;
- ::apache::thrift::protocol::TType _ktype307;
- ::apache::thrift::protocol::TType _vtype308;
- xfer += iprot->readMapBegin(_ktype307, _vtype308, _size306);
- uint32_t _i310;
- for (_i310 = 0; _i310 < _size306; ++_i310)
+ uint32_t _size305;
+ ::apache::thrift::protocol::TType _ktype306;
+ ::apache::thrift::protocol::TType _vtype307;
+ xfer += iprot->readMapBegin(_ktype306, _vtype307, _size305);
+ uint32_t _i309;
+ for (_i309 = 0; _i309 < _size305; ++_i309)
{
- std::string _key311;
- xfer += iprot->readString(_key311);
- std::string& _val312 = (*(this->success))[_key311];
- xfer += iprot->readString(_val312);
+ std::string _key310;
+ xfer += iprot->readString(_key310);
+ std::string& _val311 = (*(this->success))[_key310];
+ xfer += iprot->readString(_val311);
}
xfer += iprot->readMapEnd();
}
@@ -28639,9 +28274,9 @@ uint32_t Airavata_addLocalDataMovementDetails_args::read(::apache::thrift::proto
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast313;
- xfer += iprot->readI32(ecast313);
- this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast313;
+ int32_t ecast312;
+ xfer += iprot->readI32(ecast312);
+ this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast312;
isset_dataMoveType = true;
} else {
xfer += iprot->skip(ftype);
@@ -29584,9 +29219,9 @@ uint32_t Airavata_addSCPDataMovementDetails_args::read(::apache::thrift::protoco
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast314;
- xfer += iprot->readI32(ecast314);
- this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast314;
+ int32_t ecast313;
+ xfer += iprot->readI32(ecast313);
+ this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast313;
isset_dataMoveType = true;
} else {
xfer += iprot->skip(ftype);
@@ -30529,9 +30164,9 @@ uint32_t Airavata_addUnicoreDataMovementDetails_args::read(::apache::thrift::pro
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast315;
- xfer += iprot->readI32(ecast315);
- this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast315;
+ int32_t ecast314;
+ xfer += iprot->readI32(ecast314);
+ this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast314;
isset_dataMoveType = true;
} else {
xfer += iprot->skip(ftype);
@@ -31474,9 +31109,9 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::pro
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast316;
- xfer += iprot->readI32(ecast316);
- this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast316;
+ int32_t ecast315;
+ xfer += iprot->readI32(ecast315);
+ this->dataMoveType = ( ::apache::airavata::model::data::movement::DMType::type)ecast315;
isset_dataMoveType = true;
} else {
xfer += iprot->skip(ftype);
@@ -33026,17 +32661,17 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->jobSubmissionPriorityMap.clear();
- uint32_t _size317;
- ::apache::thrift::protocol::TType _ktype318;
- ::apache::thrift::protocol::TType _vtype319;
- xfer += iprot->readMapBegin(_ktype318, _vtype319, _size317);
- uint32_t _i321;
- for (_i321 = 0; _i321 < _size317; ++_i321)
+ uint32_t _size316;
+ ::apache::thrift::protocol::TType _ktype317;
+ ::apache::thrift::protocol::TType _vtype318;
+ xfer += iprot->readMapBegin(_ktype317, _vtype318, _size316);
+ uint32_t _i320;
+ for (_i320 = 0; _i320 < _size316; ++_i320)
{
- std::string _key322;
- xfer += iprot->readString(_key322);
- int32_t& _val323 = this->jobSubmissionPriorityMap[_key322];
- xfer += iprot->readI32(_val323);
+ std::string _key321;
+ xfer += iprot->readString(_key321);
+ int32_t& _val322 = this->jobSubmissionPriorityMap[_key321];
+ xfer += iprot->readI32(_val322);
}
xfer += iprot->readMapEnd();
}
@@ -33073,11 +32708,11 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter324;
- for (_iter324 = this->jobSubmissionPriorityMap.begin(); _iter324 != this->jobSubmissionPriorityMap.end(); ++_iter324)
+ std::map<std::string, int32_t> ::const_iterator _iter323;
+ for (_iter323 = this->jobSubmissionPriorityMap.begin(); _iter323 != this->jobSubmissionPriorityMap.end(); ++_iter323)
{
- xfer += oprot->writeString(_iter324->first);
- xfer += oprot->writeI32(_iter324->second);
+ xfer += oprot->writeString(_iter323->first);
+ xfer += oprot->writeI32(_iter323->second);
}
xfer += oprot->writeMapEnd();
}
@@ -33105,11 +32740,11 @@ uint32_t Airavata_changeJobSubmissionPriorities_pargs::write(::apache::thrift::p
xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->jobSubmissionPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter325;
- for (_iter325 = (*(this->jobSubmissionPriorityMap)).begin(); _iter325 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter325)
+ std::map<std::string, int32_t> ::const_iterator _iter324;
+ for (_iter324 = (*(this->jobSubmissionPriorityMap)).begin(); _iter324 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter324)
{
- xfer += oprot->writeString(_iter325->first);
- xfer += oprot->writeI32(_iter325->second);
+ xfer += oprot->writeString(_iter324->first);
+ xfer += oprot->writeI32(_iter324->second);
}
xfer += oprot->writeMapEnd();
}
@@ -33348,17 +32983,17 @@ uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->dataMovementPriorityMap.clear();
- uint32_t _size326;
- ::apache::thrift::protocol::TType _ktype327;
- ::apache::thrift::protocol::TType _vtype328;
- xfer += iprot->readMapBegin(_ktype327, _vtype328, _size326);
- uint32_t _i330;
- for (_i330 = 0; _i330 < _size326; ++_i330)
+ uint32_t _size325;
+ ::apache::thrift::protocol::TType _ktype326;
+ ::apache::thrift::protocol::TType _vtype327;
+ xfer += iprot->readMapBegin(_ktype326, _vtype327, _size325);
+ uint32_t _i329;
+ for (_i329 = 0; _i329 < _size325; ++_i329)
{
- std::string _key331;
- xfer += iprot->readString(_key331);
- int32_t& _val332 = this->dataMovementPriorityMap[_key331];
- xfer += iprot->readI32(_val332);
+ std::string _key330;
+ xfer += iprot->readString(_key330);
+ int32_t& _val331 = this->dataMovementPriorityMap[_key330];
+ xfer += iprot->readI32(_val331);
}
xfer += iprot->readMapEnd();
}
@@ -33395,11 +33030,11 @@ uint32_t Airavata_changeDataMovementPriorities_args::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter333;
- for (_iter333 = this->dataMovementPriorityMap.begin(); _iter333 != this->dataMovementPriorityMap.end(); ++_iter333)
+ std::map<std::string, int32_t> ::const_iterator _iter332;
+ for (_iter332 = this->dataMovementPriorityMap.begin(); _iter332 != this->dataMovementPriorityMap.end(); ++_iter332)
{
- xfer += oprot->writeString(_iter333->first);
- xfer += oprot->writeI32(_iter333->second);
+ xfer += oprot->writeString(_iter332->first);
+ xfer += oprot->writeI32(_iter332->second);
}
xfer += oprot->writeMapEnd();
}
@@ -33427,11 +33062,11 @@ uint32_t Airavata_changeDataMovementPriorities_pargs::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->dataMovementPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter334;
- for (_iter334 = (*(this->dataMovementPriorityMap)).begin(); _iter334 != (*(this->dataMovementPriorityMap)).end(); ++_iter334)
+ std::map<std::string, int32_t> ::const_iterator _iter333;
+ for (_iter333 = (*(this->dataMovementPriorityMap)).begin(); _iter333 != (*(this->dataMovementPriorityMap)).end(); ++_iter333)
{
- xfer += oprot->writeString(_iter334->first);
- xfer += oprot->writeI32(_iter334->second);
+ xfer +=
<TRUNCATED>
[07/53] [abbrv] airavata git commit: adding get all users in gateway
method
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/9dd7c14a/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 a2424c4..f23a761 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-25")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-06-27")
public class Airavata {
public interface Iface {
@@ -98,6 +98,22 @@ public class Airavata {
public String addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway) 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 users in the gateway
+ *
+ * @param gatewayId
+ * The gateway data model.
+ *
+ * @return users
+ * list of usernames of the users in the gateway
+ *
+ *
+ *
+ * @param authzToken
+ * @param gatewayId
+ */
+ public List<String> getAllUsersInGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+
+ /**
* Update previously registered Gateway metadata.
*
* @param gatewayId
@@ -2695,6 +2711,8 @@ public class Airavata {
public void addGateway(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.workspace.Gateway gateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllUsersInGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
public void updateGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.workspace.Gateway updatedGateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -3111,6 +3129,42 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGateway failed: unknown result");
}
+ public List<String> getAllUsersInGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) 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_getAllUsersInGateway(authzToken, gatewayId);
+ return recv_getAllUsersInGateway();
+ }
+
+ public void send_getAllUsersInGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.thrift.TException
+ {
+ getAllUsersInGateway_args args = new getAllUsersInGateway_args();
+ args.setAuthzToken(authzToken);
+ args.setGatewayId(gatewayId);
+ sendBase("getAllUsersInGateway", args);
+ }
+
+ public List<String> recv_getAllUsersInGateway() 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
+ {
+ getAllUsersInGateway_result result = new getAllUsersInGateway_result();
+ receiveBase(result, "getAllUsersInGateway");
+ 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, "getAllUsersInGateway failed: unknown result");
+ }
+
public void updateGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.workspace.Gateway updatedGateway) 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_updateGateway(authzToken, gatewayId, updatedGateway);
@@ -8485,6 +8539,41 @@ public class Airavata {
}
}
+ public void getAllUsersInGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ getAllUsersInGateway_call method_call = new getAllUsersInGateway_call(authzToken, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class getAllUsersInGateway_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
+ private String gatewayId;
+ public getAllUsersInGateway_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, 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;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllUsersInGateway", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getAllUsersInGateway_args args = new getAllUsersInGateway_args();
+ args.setAuthzToken(authzToken);
+ args.setGatewayId(gatewayId);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public List<String> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_getAllUsersInGateway();
+ }
+ }
+
public void updateGateway(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.workspace.Gateway updatedGateway, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
updateGateway_call method_call = new updateGateway_call(authzToken, gatewayId, updatedGateway, resultHandler, this, ___protocolFactory, ___transport);
@@ -13869,6 +13958,7 @@ public class Airavata {
processMap.put("getAPIVersion", new getAPIVersion());
processMap.put("isUserExists", new isUserExists());
processMap.put("addGateway", new addGateway());
+ processMap.put("getAllUsersInGateway", new getAllUsersInGateway());
processMap.put("updateGateway", new updateGateway());
processMap.put("getGateway", new getGateway());
processMap.put("deleteGateway", new deleteGateway());
@@ -14106,6 +14196,36 @@ public class Airavata {
}
}
+ public static class getAllUsersInGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllUsersInGateway_args> {
+ public getAllUsersInGateway() {
+ super("getAllUsersInGateway");
+ }
+
+ public getAllUsersInGateway_args getEmptyArgsInstance() {
+ return new getAllUsersInGateway_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getAllUsersInGateway_result getResult(I iface, getAllUsersInGateway_args args) throws org.apache.thrift.TException {
+ getAllUsersInGateway_result result = new getAllUsersInGateway_result();
+ try {
+ result.success = iface.getAllUsersInGateway(args.authzToken, args.gatewayId);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ } catch (org.apache.airavata.model.error.AuthorizationException ae) {
+ result.ae = ae;
+ }
+ return result;
+ }
+ }
+
public static class updateGateway<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGateway_args> {
public updateGateway() {
super("updateGateway");
@@ -18463,6 +18583,7 @@ public class Airavata {
processMap.put("getAPIVersion", new getAPIVersion());
processMap.put("isUserExists", new isUserExists());
processMap.put("addGateway", new addGateway());
+ processMap.put("getAllUsersInGateway", new getAllUsersInGateway());
processMap.put("updateGateway", new updateGateway());
processMap.put("getGateway", new getGateway());
processMap.put("deleteGateway", new deleteGateway());
@@ -18826,91 +18947,20 @@ public class Airavata {
}
}
- public static class updateGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGateway_args, Void> {
- public updateGateway() {
- super("updateGateway");
+ public static class getAllUsersInGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUsersInGateway_args, List<String>> {
+ public getAllUsersInGateway() {
+ super("getAllUsersInGateway");
}
- public updateGateway_args getEmptyArgsInstance() {
- return new updateGateway_args();
+ public getAllUsersInGateway_args getEmptyArgsInstance() {
+ return new getAllUsersInGateway_args();
}
- public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Void>() {
- public void onComplete(Void o) {
- updateGateway_result result = new updateGateway_result();
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- updateGateway_result result = new updateGateway_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
- result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
- result.setAeIsSet(true);
- msg = result;
- }
- else
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, updateGateway_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.updateGateway(args.authzToken, args.gatewayId, args.updatedGateway,resultHandler);
- }
- }
-
- public static class getGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGateway_args, org.apache.airavata.model.workspace.Gateway> {
- public getGateway() {
- super("getGateway");
- }
-
- public getGateway_args getEmptyArgsInstance() {
- return new getGateway_args();
- }
-
- public AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<String>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway>() {
- public void onComplete(org.apache.airavata.model.workspace.Gateway o) {
- getGateway_result result = new getGateway_result();
+ return new AsyncMethodCallback<List<String>>() {
+ public void onComplete(List<String> o) {
+ getAllUsersInGateway_result result = new getAllUsersInGateway_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18923,7 +18973,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getGateway_result result = new getGateway_result();
+ getAllUsersInGateway_result result = new getAllUsersInGateway_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18964,27 +19014,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getGateway_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway> resultHandler) throws TException {
- iface.getGateway(args.authzToken, args.gatewayId,resultHandler);
+ public void start(I iface, getAllUsersInGateway_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException {
+ iface.getAllUsersInGateway(args.authzToken, args.gatewayId,resultHandler);
}
}
- public static class deleteGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGateway_args, Boolean> {
- public deleteGateway() {
- super("deleteGateway");
+ public static class updateGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGateway_args, Void> {
+ public updateGateway() {
+ super("updateGateway");
}
- public deleteGateway_args getEmptyArgsInstance() {
- return new deleteGateway_args();
+ public updateGateway_args getEmptyArgsInstance() {
+ return new updateGateway_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- deleteGateway_result result = new deleteGateway_result();
- result.success = o;
- result.setSuccessIsSet(true);
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ updateGateway_result result = new updateGateway_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -18996,7 +19044,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteGateway_result result = new deleteGateway_result();
+ updateGateway_result result = new updateGateway_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19037,25 +19085,25 @@ public class Airavata {
return false;
}
- public void start(I iface, deleteGateway_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteGateway(args.authzToken, args.gatewayId,resultHandler);
+ public void start(I iface, updateGateway_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.updateGateway(args.authzToken, args.gatewayId, args.updatedGateway,resultHandler);
}
}
- public static class getAllGateways<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGateways_args, List<org.apache.airavata.model.workspace.Gateway>> {
- public getAllGateways() {
- super("getAllGateways");
+ public static class getGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGateway_args, org.apache.airavata.model.workspace.Gateway> {
+ public getGateway() {
+ super("getGateway");
}
- public getAllGateways_args getEmptyArgsInstance() {
- return new getAllGateways_args();
+ public getGateway_args getEmptyArgsInstance() {
+ return new getGateway_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>>() {
- public void onComplete(List<org.apache.airavata.model.workspace.Gateway> o) {
- getAllGateways_result result = new getAllGateways_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway>() {
+ public void onComplete(org.apache.airavata.model.workspace.Gateway o) {
+ getGateway_result result = new getGateway_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19068,7 +19116,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAllGateways_result result = new getAllGateways_result();
+ getGateway_result result = new getGateway_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19109,25 +19157,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getAllGateways_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>> resultHandler) throws TException {
- iface.getAllGateways(args.authzToken,resultHandler);
+ public void start(I iface, getGateway_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workspace.Gateway> resultHandler) throws TException {
+ iface.getGateway(args.authzToken, args.gatewayId,resultHandler);
}
}
- public static class isGatewayExist<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isGatewayExist_args, Boolean> {
- public isGatewayExist() {
- super("isGatewayExist");
+ public static class deleteGateway<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGateway_args, Boolean> {
+ public deleteGateway() {
+ super("deleteGateway");
}
- public isGatewayExist_args getEmptyArgsInstance() {
- return new isGatewayExist_args();
+ public deleteGateway_args getEmptyArgsInstance() {
+ return new deleteGateway_args();
}
public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Boolean>() {
public void onComplete(Boolean o) {
- isGatewayExist_result result = new isGatewayExist_result();
+ deleteGateway_result result = new deleteGateway_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -19141,7 +19189,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- isGatewayExist_result result = new isGatewayExist_result();
+ deleteGateway_result result = new deleteGateway_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19182,25 +19230,25 @@ public class Airavata {
return false;
}
- public void start(I iface, isGatewayExist_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.isGatewayExist(args.authzToken, args.gatewayId,resultHandler);
+ public void start(I iface, deleteGateway_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.deleteGateway(args.authzToken, args.gatewayId,resultHandler);
}
}
- public static class createNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createNotification_args, String> {
- public createNotification() {
- super("createNotification");
+ public static class getAllGateways<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGateways_args, List<org.apache.airavata.model.workspace.Gateway>> {
+ public getAllGateways() {
+ super("getAllGateways");
}
- public createNotification_args getEmptyArgsInstance() {
- return new createNotification_args();
+ public getAllGateways_args getEmptyArgsInstance() {
+ return new getAllGateways_args();
}
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- createNotification_result result = new createNotification_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>>() {
+ public void onComplete(List<org.apache.airavata.model.workspace.Gateway> o) {
+ getAllGateways_result result = new getAllGateways_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19213,7 +19261,152 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- createNotification_result result = new createNotification_result();
+ getAllGateways_result result = new getAllGateways_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, getAllGateways_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.workspace.Gateway>> resultHandler) throws TException {
+ iface.getAllGateways(args.authzToken,resultHandler);
+ }
+ }
+
+ public static class isGatewayExist<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isGatewayExist_args, Boolean> {
+ public isGatewayExist() {
+ super("isGatewayExist");
+ }
+
+ public isGatewayExist_args getEmptyArgsInstance() {
+ return new isGatewayExist_args();
+ }
+
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ isGatewayExist_result result = new isGatewayExist_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ isGatewayExist_result result = new isGatewayExist_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, isGatewayExist_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.isGatewayExist(args.authzToken, args.gatewayId,resultHandler);
+ }
+ }
+
+ public static class createNotification<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createNotification_args, String> {
+ public createNotification() {
+ super("createNotification");
+ }
+
+ public createNotification_args getEmptyArgsInstance() {
+ return new createNotification_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ createNotification_result result = new createNotification_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ createNotification_result result = new createNotification_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32927,28 +33120,25 @@ public class Airavata {
}
- public static class updateGateway_args implements org.apache.thrift.TBase<updateGateway_args, updateGateway_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateGateway_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateGateway_args");
+ public static class getAllUsersInGateway_args implements org.apache.thrift.TBase<getAllUsersInGateway_args, getAllUsersInGateway_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllUsersInGateway_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllUsersInGateway_args");
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField 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 UPDATED_GATEWAY_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedGateway", org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new updateGateway_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new updateGateway_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAllUsersInGateway_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAllUsersInGateway_argsTupleSchemeFactory());
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String gatewayId; // required
- public org.apache.airavata.model.workspace.Gateway updatedGateway; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
AUTHZ_TOKEN((short)1, "authzToken"),
- GATEWAY_ID((short)2, "gatewayId"),
- UPDATED_GATEWAY((short)3, "updatedGateway");
+ GATEWAY_ID((short)2, "gatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -32967,8 +33157,6 @@ public class Airavata {
return AUTHZ_TOKEN;
case 2: // GATEWAY_ID
return GATEWAY_ID;
- case 3: // UPDATED_GATEWAY
- return UPDATED_GATEWAY;
default:
return null;
}
@@ -33016,57 +33204,49 @@ public class Airavata {
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.UPDATED_GATEWAY, new org.apache.thrift.meta_data.FieldMetaData("updatedGateway", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workspace.Gateway.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateGateway_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllUsersInGateway_args.class, metaDataMap);
}
- public updateGateway_args() {
+ public getAllUsersInGateway_args() {
}
- public updateGateway_args(
+ public getAllUsersInGateway_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- String gatewayId,
- org.apache.airavata.model.workspace.Gateway updatedGateway)
+ String gatewayId)
{
this();
this.authzToken = authzToken;
this.gatewayId = gatewayId;
- this.updatedGateway = updatedGateway;
}
/**
* Performs a deep copy on <i>other</i>.
*/
- public updateGateway_args(updateGateway_args other) {
+ public getAllUsersInGateway_args(getAllUsersInGateway_args other) {
if (other.isSetAuthzToken()) {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
if (other.isSetGatewayId()) {
this.gatewayId = other.gatewayId;
}
- if (other.isSetUpdatedGateway()) {
- this.updatedGateway = new org.apache.airavata.model.workspace.Gateway(other.updatedGateway);
- }
}
- public updateGateway_args deepCopy() {
- return new updateGateway_args(this);
+ public getAllUsersInGateway_args deepCopy() {
+ return new getAllUsersInGateway_args(this);
}
@Override
public void clear() {
this.authzToken = null;
this.gatewayId = null;
- this.updatedGateway = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
return this.authzToken;
}
- public updateGateway_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+ public getAllUsersInGateway_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
this.authzToken = authzToken;
return this;
}
@@ -33090,7 +33270,7 @@ public class Airavata {
return this.gatewayId;
}
- public updateGateway_args setGatewayId(String gatewayId) {
+ public getAllUsersInGateway_args setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
return this;
}
@@ -33110,30 +33290,6 @@ public class Airavata {
}
}
- public org.apache.airavata.model.workspace.Gateway getUpdatedGateway() {
- return this.updatedGateway;
- }
-
- public updateGateway_args setUpdatedGateway(org.apache.airavata.model.workspace.Gateway updatedGateway) {
- this.updatedGateway = updatedGateway;
- return this;
- }
-
- public void unsetUpdatedGateway() {
- this.updatedGateway = null;
- }
-
- /** Returns true if field updatedGateway is set (has been assigned a value) and false otherwise */
- public boolean isSetUpdatedGateway() {
- return this.updatedGateway != null;
- }
-
- public void setUpdatedGatewayIsSet(boolean value) {
- if (!value) {
- this.updatedGateway = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -33152,14 +33308,6 @@ public class Airavata {
}
break;
- case UPDATED_GATEWAY:
- if (value == null) {
- unsetUpdatedGateway();
- } else {
- setUpdatedGateway((org.apache.airavata.model.workspace.Gateway)value);
- }
- break;
-
}
}
@@ -33171,9 +33319,6 @@ public class Airavata {
case GATEWAY_ID:
return getGatewayId();
- case UPDATED_GATEWAY:
- return getUpdatedGateway();
-
}
throw new IllegalStateException();
}
@@ -33189,8 +33334,6 @@ public class Airavata {
return isSetAuthzToken();
case GATEWAY_ID:
return isSetGatewayId();
- case UPDATED_GATEWAY:
- return isSetUpdatedGateway();
}
throw new IllegalStateException();
}
@@ -33199,12 +33342,12 @@ public class Airavata {
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof updateGateway_args)
- return this.equals((updateGateway_args)that);
+ if (that instanceof getAllUsersInGateway_args)
+ return this.equals((getAllUsersInGateway_args)that);
return false;
}
- public boolean equals(updateGateway_args that) {
+ public boolean equals(getAllUsersInGateway_args that) {
if (that == null)
return false;
@@ -33226,15 +33369,6 @@ public class Airavata {
return false;
}
- boolean this_present_updatedGateway = true && this.isSetUpdatedGateway();
- boolean that_present_updatedGateway = true && that.isSetUpdatedGateway();
- if (this_present_updatedGateway || that_present_updatedGateway) {
- if (!(this_present_updatedGateway && that_present_updatedGateway))
- return false;
- if (!this.updatedGateway.equals(that.updatedGateway))
- return false;
- }
-
return true;
}
@@ -33252,16 +33386,11 @@ public class Airavata {
if (present_gatewayId)
list.add(gatewayId);
- boolean present_updatedGateway = true && (isSetUpdatedGateway());
- list.add(present_updatedGateway);
- if (present_updatedGateway)
- list.add(updatedGateway);
-
return list.hashCode();
}
@Override
- public int compareTo(updateGateway_args other) {
+ public int compareTo(getAllUsersInGateway_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -33288,16 +33417,6 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUpdatedGateway()).compareTo(other.isSetUpdatedGateway());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetUpdatedGateway()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedGateway, other.updatedGateway);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -33315,7 +33434,7 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("updateGateway_args(");
+ StringBuilder sb = new StringBuilder("getAllUsersInGateway_args(");
boolean first = true;
sb.append("authzToken:");
@@ -33333,14 +33452,6 @@ public class Airavata {
sb.append(this.gatewayId);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("updatedGateway:");
- if (this.updatedGateway == null) {
- sb.append("null");
- } else {
- sb.append(this.updatedGateway);
- }
- first = false;
sb.append(")");
return sb.toString();
}
@@ -33353,16 +33464,10 @@ public class Airavata {
if (gatewayId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
}
- if (updatedGateway == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'updatedGateway' was not present! Struct: " + toString());
- }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
}
- if (updatedGateway != null) {
- updatedGateway.validate();
- }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -33381,15 +33486,15 @@ public class Airavata {
}
}
- private static class updateGateway_argsStandardSchemeFactory implements SchemeFactory {
- public updateGateway_argsStandardScheme getScheme() {
- return new updateGateway_argsStandardScheme();
+ private static class getAllUsersInGateway_argsStandardSchemeFactory implements SchemeFactory {
+ public getAllUsersInGateway_argsStandardScheme getScheme() {
+ return new getAllUsersInGateway_argsStandardScheme();
}
}
- private static class updateGateway_argsStandardScheme extends StandardScheme<updateGateway_args> {
+ private static class getAllUsersInGateway_argsStandardScheme extends StandardScheme<getAllUsersInGateway_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, updateGateway_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllUsersInGateway_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -33416,15 +33521,6 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // UPDATED_GATEWAY
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.updatedGateway = new org.apache.airavata.model.workspace.Gateway();
- struct.updatedGateway.read(iprot);
- struct.setUpdatedGatewayIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -33436,7 +33532,7 @@ public class Airavata {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, updateGateway_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllUsersInGateway_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -33450,52 +33546,44 @@ public class Airavata {
oprot.writeString(struct.gatewayId);
oprot.writeFieldEnd();
}
- if (struct.updatedGateway != null) {
- oprot.writeFieldBegin(UPDATED_GATEWAY_FIELD_DESC);
- struct.updatedGateway.write(oprot);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
}
- private static class updateGateway_argsTupleSchemeFactory implements SchemeFactory {
- public updateGateway_argsTupleScheme getScheme() {
- return new updateGateway_argsTupleScheme();
+ private static class getAllUsersInGateway_argsTupleSchemeFactory implements SchemeFactory {
+ public getAllUsersInGateway_argsTupleScheme getScheme() {
+ return new getAllUsersInGateway_argsTupleScheme();
}
}
- private static class updateGateway_argsTupleScheme extends TupleScheme<updateGateway_args> {
+ private static class getAllUsersInGateway_argsTupleScheme extends TupleScheme<getAllUsersInGateway_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, updateGateway_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAllUsersInGateway_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
oprot.writeString(struct.gatewayId);
- struct.updatedGateway.write(oprot);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, updateGateway_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAllUsersInGateway_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.updatedGateway = new org.apache.airavata.model.workspace.Gateway();
- struct.updatedGateway.read(iprot);
- struct.setUpdatedGatewayIsSet(true);
}
}
}
- public static class updateGateway_result implements org.apache.thrift.TBase<updateGateway_result, updateGateway_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateGateway_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateGateway_result");
+ public static class getAllUsersInGateway_result implements org.apache.thrift.TBase<getAllUsersInGateway_result, getAllUsersInGateway_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAllUsersInGateway_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllUsersInGateway_result");
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
@@ -33503,10 +33591,11 @@ public class Airavata {
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new updateGateway_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new updateGateway_resultTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAllUsersInGateway_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAllUsersInGateway_resultTupleSchemeFactory());
}
+ public List<String> success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -33514,6 +33603,7 @@ public class Airavata {
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ SUCCESS((short)0, "success"),
IRE((short)1, "ire"),
ACE((short)2, "ace"),
ASE((short)3, "ase"),
@@ -33532,6 +33622,8 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
+ case 0: // SUCCESS
+ return SUCCESS;
case 1: // IRE
return IRE;
case 2: // ACE
@@ -33583,6 +33675,9 @@ 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -33592,19 +33687,21 @@ public class Airavata {
tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateGateway_result.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllUsersInGateway_result.class, metaDataMap);
}
- public updateGateway_result() {
+ public getAllUsersInGateway_result() {
}
- public updateGateway_result(
+ public getAllUsersInGateway_result(
+ List<String> success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
org.apache.airavata.model.error.AiravataSystemException ase,
org.apache.airavata.model.error.AuthorizationException ae)
{
this();
+ this.success = success;
this.ire = ire;
this.ace = ace;
this.ase = ase;
@@ -33614,7 +33711,11 @@ public class Airavata {
/**
* Performs a deep copy on <i>other</i>.
*/
- public updateGateway_result(updateGateway_result other) {
+ public getAllUsersInGateway_result(getAllUsersInGateway_result other) {
+ if (other.isSetSuccess()) {
+ List<String> __this__success = new ArrayList<String>(other.success);
+ this.success = __this__success;
+ }
if (other.isSetIre()) {
this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
}
@@ -33629,23 +33730,63 @@ public class Airavata {
}
}
- public updateGateway_result deepCopy() {
- return new updateGateway_result(this);
+ public getAllUsersInGateway_result deepCopy() {
+ return new getAllUsersInGateway_result(this);
}
@Override
public void clear() {
+ this.success = null;
this.ire = null;
this.ace = null;
this.ase = null;
this.ae = null;
}
+ public int getSuccessSize() {
+ return (this.success == null) ? 0 : this.success.size();
+ }
+
+ public java.util.Iterator<String> getSuccessIterator() {
+ return (this.success == null) ? null : this.success.iterator();
+ }
+
+ public void addToSuccess(String elem) {
+ if (this.success == null) {
+ this.success = new ArrayList<String>();
+ }
+ this.success.add(elem);
+ }
+
+ public List<String> getSuccess() {
+ return this.success;
+ }
+
+ public getAllUsersInGateway_result setSuccess(List<String> success) {
+ this.success = success;
+ return this;
+ }
+
+ public void unsetSuccess() {
+ this.success = null;
+ }
+
+ /** Returns true if field success is set (has been assigned a value) and false otherwise */
+ public boolean isSetSuccess() {
+ return this.success != null;
+ }
+
+ public void setSuccessIsSet(boolean value) {
+ if (!value) {
+ this.success = null;
+ }
+ }
+
public org.apache.airavata.model.error.InvalidRequestException getIre() {
return this.ire;
}
- public updateGateway_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+ public getAllUsersInGateway_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
this.ire = ire;
return this;
}
@@ -33669,7 +33810,7 @@ public class Airavata {
return this.ace;
}
- public updateGateway_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+ public getAllUsersInGateway_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
this.ace = ace;
return this;
}
@@ -33693,7 +33834,7 @@ public class Airavata {
return this.ase;
}
- public updateGateway_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+ public getAllUsersInGateway_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
this.ase = ase;
return this;
}
@@ -33717,7 +33858,7 @@ public class Airavata {
return this.ae;
}
- public updateGateway_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
+ public getAllUsersInGateway_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
this.ae = ae;
return this;
}
@@ -33739,6 +33880,14 @@ public class Airavata {
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case SUCCESS:
+ if (value == null) {
+ unsetSuccess();
+ } else {
+ setSuccess((List<String>)value);
+ }
+ break;
+
case IRE:
if (value == null) {
unsetIre();
@@ -33776,6 +33925,9 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
+ case SUCCESS:
+ return getSuccess();
+
case IRE:
return getIre();
@@ -33799,6 +33951,8 @@ public class Airavata {
}
switch (field) {
+ case SUCCESS:
+ return isSetSuccess();
case IRE:
return isSetIre();
case ACE:
@@ -33815,15 +33969,24 @@ public class Airavata {
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof updateGateway_result)
- return this.equals((updateGateway_result)that);
+ if (that instanceof getAllUsersInGateway_result)
+ return this.equals((getAllUsersInGateway_result)that);
return false;
}
- public boolean equals(updateGateway_result that) {
+ public boolean equals(getAllUsersInGateway_result that) {
if (that == null)
return false;
+ boolean this_present_success = true && this.isSetSuccess();
+ boolean that_present_success = true && that.isSetSuccess();
+ if (this_present_success || that_present_success) {
+ if (!(this_present_success && that_present_success))
+ return false;
+ if (!this.success.equals(that.success))
+ return false;
+ }
+
boolean this_present_ire = true && this.isSetIre();
boolean that_present_ire = true && that.isSetIre();
if (this_present_ire || that_present_ire) {
@@ -33867,6 +34030,11 @@ public class Airavata {
public int hashCode() {
List<Object> list = new ArrayList<Object>();
+ boolean present_success = true && (isSetSuccess());
+ list.add(present_success);
+ if (present_success)
+ list.add(success);
+
boolean present_ire = true && (isSetIre());
list.add(present_ire);
if (present_ire)
@@ -33891,13 +34059,23 @@ public class Airavata {
}
@Override
- public int compareTo(updateGateway_result other) {
+ public int compareTo(getAllUsersInGateway_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSuccess()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetIre()).compareTo(other.isSetIre());
if (lastComparison != 0) {
return lastComparison;
@@ -33955,9 +34133,17 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("updateGateway_result(");
+ StringBuilder sb = new StringBuilder("getAllUsersInGateway_result(");
boolean first = true;
+ sb.append("success:");
+ if (this.success == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.success);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("ire:");
if (this.ire == null) {
sb.append("null");
@@ -34014,15 +34200,15 @@ public class Airavata {
}
}
- private static class updateGateway_resultStandardSchemeFactory implements SchemeFactory {
- public updateGateway_resultStandardScheme getScheme() {
- return new updateGateway_resultStandardScheme();
+ private static class getAllUsersInGateway_resultStandardSchemeFactory implements SchemeFactory {
+ public getAllUsersInGateway_resultStandardScheme getScheme() {
+ return new getAllUsersInGateway_resultStandardScheme();
}
}
- private static class updateGateway_resultStandardScheme extends StandardScheme<updateGateway_result> {
+ private static class getAllUsersInGateway_resultStandardScheme extends StandardScheme<getAllUsersInGateway_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, updateGateway_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllUsersInGateway_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -34032,6 +34218,24 @@ public class Airavata {
break;
}
switch (schemeField.id) {
+ case 0: // SUCCESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.success = new ArrayList<String>(_list0.size);
+ String _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = iprot.readString();
+ struct.success.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
+ struct.setSuccessIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
case 1: // IRE
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
@@ -34079,10 +34283,22 @@ public class Airavata {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, updateGateway_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllUsersInGateway_result struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.success != null) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
+ for (String _iter3 : struct.success)
+ {
+ oprot.writeString(_iter3);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
if (struct.ire != null) {
oprot.writeFieldBegin(IRE_FIELD_DESC);
struct.ire.write(oprot);
@@ -34109,31 +34325,43 @@ public class Airavata {
}
- private static class updateGateway_resultTupleSchemeFactory implements SchemeFactory {
- public updateGateway_resultTupleScheme getScheme() {
- return new updateGateway_resultTupleScheme();
+ private static class getAllUsersInGateway_resultTupleSchemeFactory implements SchemeFactory {
+ public getAllUsersInGateway_resultTupleScheme getScheme() {
+ return new getAllUsersInGateway_resultTupleScheme();
}
}
- private static class updateGateway_resultTupleScheme extends TupleScheme<updateGateway_result> {
+ private static class getAllUsersInGateway_resultTupleScheme extends TupleScheme<getAllUsersInGateway_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, updateGateway_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAllUsersInGateway_result struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
- if (struct.isSetIre()) {
+ if (struct.isSetSuccess()) {
optionals.set(0);
}
- if (struct.isSetAce()) {
+ if (struct.isSetIre()) {
optionals.set(1);
}
- if (struct.isSetAse()) {
+ if (struct.isSetAce()) {
optionals.set(2);
}
- if (struct.isSetAe()) {
+ if (struct.isSetAse()) {
optionals.set(3);
}
- oprot.writeBitSet(optionals, 4);
+ if (struct.isSetAe()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
+ if (struct.isSetSuccess()) {
+ {
+ oprot.writeI32(struct.success.size());
+ for (String _iter4 : struct.success)
+ {
+ oprot.writeString(_iter4);
+ }
+ }
+ }
if (struct.isSetIre()) {
struct.ire.write(oprot);
}
@@ -34149,25 +34377,38 @@ public class Airavata {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, updateGateway_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAllUsersInGateway_result struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(4);
+ BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.success = new ArrayList<String>(_list5.size);
+ String _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ {
+ _elem6 = iprot.readString();
+ struct.success.add(_elem6);
+ }
+ }
+ struct.setSuccessIsSet(true);
+ }
+ if (incoming.get(1)) {
struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
struct.ire.read(iprot);
struct.setIreIsSet(true);
}
- if (incoming.get(1)) {
+ if (incoming.get(2)) {
struct.ace = new org.apache.airavata.model.error.AiravataClientException();
struct.ace.read(iprot);
struct.setAceIsSet(true);
}
- if (incoming.get(2)) {
+ if (incoming.get(3)) {
struct.ase = new org.apache.airavata.model.error.AiravataSystemException();
struct.ase.read(iprot);
struct.setAseIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(4)) {
struct.ae = new org.apache.airavata.model.error.AuthorizationException();
struct.ae.read(iprot);
struct.setAeIsSet(true);
@@ -34177,25 +34418,28 @@ public class Airavata {
}
- public static class getGateway_args implements org.apache.thrift.TBase<getGateway_args, getGateway_args._Fields>, java.io.Serializable, Cloneable, Comparable<getGateway_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getGateway_args");
+ public static class updateGateway_args implements org.apache.thrift.TBase<updateGateway_args, updateGateway_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateGateway_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateGateway_args");
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField 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 UPDATED_GATEWAY_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedGateway", org.apache.thrift.protocol.TType.STRUCT, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new getGateway_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getGateway_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new updateGateway_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new updateGateway_argsTupleSchemeFactory());
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String gatewayId; // required
+ public org.apache.airavata.model.workspace.Gateway updatedGateway; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
AUTHZ_TOKEN((short)1, "authzToken"),
- GATEWAY_ID((short)2, "gatewayId");
+ GATEWAY_ID((short)2, "gatewayId"),
+ UPDATED_GATEWAY((short)3, "updatedGateway");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -34214,6 +34458,8 @@ public class Airavata {
return AUTHZ_TOKEN;
case 2: // GATEWAY_ID
return GATEWAY_ID;
+ case 3: // UPDATED_GATEWAY
+ return UPDATED_GATEWAY;
default:
return null;
}
@@ -34261,49 +34507,57 @@ public class Airavata {
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.UPDATED_GATEWAY, new org.apache.thrift.meta_data.FieldMetaData("updatedGateway", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workspace.Gateway.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getGateway_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateGateway_args.class, metaDataMap);
}
- public getGateway_args() {
+ public updateGateway_args() {
}
- public getGateway_args(
+ public updateGateway_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- String gatewayId)
+ String gatewayId,
+ org.apache.airavata.model.workspace.Gateway updatedGateway)
{
this();
this.authzToken = authzToken;
this.gatewayId = gatewayId;
+ this.updatedGateway = updatedGateway;
}
/**
* Performs a deep copy on <i>other</i>.
*/
- public getGateway_args(getGateway_args other) {
+ public updateGateway_args(updateGateway_args other) {
if (other.isSetAuthzToken()) {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
if (other.isSetGatewayId()) {
this.gatewayId = other.gatewayId;
}
+ if (other.isSetUpdatedGateway()) {
+ this.updatedGateway = new org.apache.airavata.model.workspace.Gateway(other.updatedGateway);
+ }
}
- public getGateway_args deepCopy() {
- return new getGateway_args(this);
+ public updateGateway_args deepCopy() {
+ return new updateGateway_args(this);
}
@Override
public void clear() {
this.authzToken = null;
this.gatewayId = null;
+ this.updatedGateway = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
return this.authzToken;
}
- public getGateway_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+ public updateGateway_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
this.authzToken = authzToken;
return this;
}
@@ -34327,7 +34581,7 @@ public class Airavata {
return this.gatewayId;
}
- public getGateway_args setGatewayId(String gatewayId) {
+ public updateGateway_args setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
return this;
}
@@ -34347,6 +34601,30 @@ public class Airavata {
}
}
+ public org.apache.airavata.model.workspace.Gateway getUpdatedGateway() {
+ return this.updatedGateway;
+ }
+
+ public updateGateway_args setUpdatedGateway(org.apache.airavata.model.workspace.Gateway updatedGateway) {
+ this.updatedGateway = updatedGateway;
+ return this;
+ }
+
+ public void unsetUpdatedGateway() {
+ this.updatedGateway = null;
+ }
+
+ /** Returns true if field updatedGateway is set (has been assigned a value) and false otherwise */
+ public boolean isSetUpdatedGateway() {
+ return this.updatedGateway != null;
+ }
+
+ public void setUpdatedGatewayIsSet(boolean value) {
+ if (!value) {
+ this.updatedGateway = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -34365,6 +34643,14 @@ public class Airavata {
}
break;
+ case UPDATED_GATEWAY:
+ if (value == null) {
+ unsetUpdatedGateway();
+ } else {
+ setUpdatedGateway((org.apache.airavata.model.workspace.Gateway)value);
+ }
+ break;
+
}
}
@@ -34376,6 +34662,9 @@ public class Airavata {
case GATEWAY_ID:
return getGatewayId();
+ case UPDATED_GATEWAY:
+ return getUpdatedGateway();
+
}
throw new IllegalStateException();
}
@@ -34391,6 +34680,8 @@ public class Airavata {
return isSetAuthzToken();
case GATEWAY_ID:
return isSetGatewayId();
+ case UPDATED_GATEWAY:
+ return isSetUpdatedGateway();
}
throw new IllegalStateException();
}
@@ -34399,12 +34690,12 @@ public class Airavata {
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof getGateway_args)
- return this.equals((getGateway_args)that);
+ if (that instanceof updateGateway_args)
+ return this.equals((updateGateway_args)that);
return false;
}
- public boolean equals(getGateway_args that) {
+ public boolean equals(updateGateway_args that) {
if (that == null)
return false;
@@ -34426,6 +34717,15 @@ public class Airavata {
return false;
}
+ boolean this_present_updatedGateway = true && this.isSetUpdatedGateway();
+ boolean that_present_updatedGateway = true && that.isSetUpdatedGateway();
+ if (this_present_updatedGateway || that_present_updatedGateway) {
+ if (!(this_present_updatedGateway && that_present_updatedGateway))
+ return false;
+ if (!this.updatedGateway.equals(that.updatedGateway))
+ return false;
+ }
+
return true;
}
@@ -34443,11 +34743,16 @@ public class Airavata {
if (present_gatewayId)
list.add(gatewayId);
+ boolean present_updatedGateway = true && (isSetUpdatedGateway());
+ list.add(present_updatedGateway);
+ if (present_updatedGateway)
+ list.add(updatedGateway);
+
return list.hashCode();
}
@Override
- public int compareTo(getGateway_args other) {
+ public int compareTo(updateGateway_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -34474,6 +34779,16 @@ public class Airavata {
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetUpdatedGateway()).compareTo(other.isSetUpdatedGateway());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUpdatedGateway()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedGateway, other.updatedGateway);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -34491,7 +34806,7 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("getGateway_args(");
+ StringBuilder sb = new StringBuilder("updateGateway_args(");
boolean first = true;
sb.append("authzToken:");
@@ -34509,6 +34824,14 @@ public class Airavata {
sb.append(this.gatewayId);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("updatedGateway:");
+ if (this.updatedGateway == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.updatedGateway);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -34521,10 +34844,16 @@ public class Airavata {
if (gatewayId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
}
+ if (updatedGateway == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'updatedGateway' was not present! Struct: " + toString());
+ }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
}
+ if (updatedGateway != null) {
+ updatedGateway.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -34543,15 +34872,15 @@ public class Airavata {
}
}
- private static class getGateway_argsStandardSchemeFactory implements SchemeFactory {
- public getGateway_argsStandardScheme getScheme() {
- return new getGateway_argsStandardScheme();
+ private static class updateGateway_argsStandardSchemeFactory implements SchemeFactory {
+ public updateGateway_argsStandardScheme getScheme() {
+ return new updateGateway_argsStandardScheme();
}
}
- private static class getGateway_argsStandardScheme extends StandardScheme<getGateway_args> {
+ private static class updateGateway_argsStandardScheme extends StandardScheme<updateGateway_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, getGateway_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, updateGateway_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -34578,6 +34907,15 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 3: // UPDATED_GATEWAY
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.updatedGateway = new org.apache.airavata.model.workspace.Gateway();
+ struct.updatedGateway.read(iprot);
+ struct.setUpdatedGatewayIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -34589,7 +34927,7 @@ public class Airavata {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, getGateway_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, updateGateway_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -34603,44 +34941,52 @@ public class Airavata {
oprot.writeString(struct.gatewayId);
oprot.writeFieldEnd();
}
+ if (struct.updatedGateway != null) {
+ oprot.writeFieldBegin(UPDATED_GATEWAY_FIELD_DESC);
+ struct.updatedGateway.write(oprot);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
}
- private static class getGateway_argsTupleSchemeFactory implements SchemeFactory {
- public getGateway_argsTupleScheme getScheme() {
- return new getGateway_argsTupleScheme();
+ private static class updateGateway_argsTupleSchemeFactory implements SchemeFactory {
+ public updateGateway_argsTupleScheme getScheme() {
+ return new updateGateway_argsTupleScheme();
}
}
- private static class getGateway_argsTupleScheme extends TupleScheme<getGateway_args> {
+ private static class updateGateway_argsTupleScheme extends TupleScheme<updateGateway_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getGateway_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, updateGateway_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
oprot.writeString(struct.gatewayId);
+ struct.updatedGateway.write(oprot);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getGateway_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, updateGateway_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.updatedGateway = new org.apache.airavata.model.workspace.Gateway();
+ struct.updatedGateway.read(iprot);
+ struct.setUpdatedGatewayIsSet(true);
}
}
}
- public static class getGateway_result implements org.apache.thrift.TBase<getGateway_result, getGateway_result._Fields>, java.io.Serializable, Cloneable, Comparable<getGateway_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getGateway_result");
+ public static class updateGateway_result implements org.apache.thrift.TBase<updateGateway_result, updateGateway_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateGateway_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateGateway_result");
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
@@ -34648,11 +34994,10 @@ public class Airavata {
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new getGateway_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getGateway_resultTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new updateGateway_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new updateGateway_resultTupleSchemeFactory());
}
- public org.apache.airavata.model.workspace.Gateway success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -34660,7 +35005,6 @@ public class Airavata {
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- SUCCESS((short)0, "success"),
IRE((short)1, "ire"),
ACE((short)2, "ace"),
ASE((short)3, "ase"),
@@ -34679,8 +35023,6 @@ public class Airavata {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 0: // SUCCESS
- return SUCCESS;
case 1: // IRE
return IRE;
case 2: // ACE
@@ -34732,8 +35074,6 @@ 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workspace.Gateway.class)));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData(
<TRUNCATED>
[47/53] [abbrv] airavata git commit: handling URI_COLLECTION type
when creating process input model
Posted by sh...@apache.org.
handling URI_COLLECTION type when creating process input model
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d20f77e4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d20f77e4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d20f77e4
Branch: refs/heads/master
Commit: d20f77e4b5d3545fe01facbb9b2a3b0f9f6ce16c
Parents: c382ae2
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 5 18:50:29 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 5 18:50:29 2016 -0400
----------------------------------------------------------------------
.../server/OrchestratorServerHandler.java | 40 +++++++++++++++++---
1 file changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d20f77e4/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 1367e44..60cb7a0 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -38,6 +38,7 @@ import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePrefer
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.data.replica.DataProductModel;
+import org.apache.airavata.model.data.replica.DataReplicaLocationModel;
import org.apache.airavata.model.data.replica.ReplicaLocationCategory;
import org.apache.airavata.model.error.LaunchValidationException;
import org.apache.airavata.model.experiment.ExperimentModel;
@@ -59,6 +60,7 @@ import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractRes
import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.core.experiment.catalog.resources.AbstractExpCatResource;
import org.apache.airavata.registry.cpi.*;
+import org.apache.commons.lang.StringUtils;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -168,11 +170,39 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
if (pi.getType().equals(DataType.URI) && pi.getValue().startsWith("airavata-dp://")) {
try {
DataProductModel dataProductModel = replicaCatalog.getDataProduct(pi.getValue());
- dataProductModel.getReplicaLocations().stream().filter(rpModel -> rpModel.getReplicaLocationCategory()
- .equals(ReplicaLocationCategory.GATEWAY_DATA_STORE)).forEach(rpModel -> {
- pi.setValue(rpModel.getFilePath());
- pi.setStorageResourceId(rpModel.getStorageResourceId());
- });
+ Optional<DataReplicaLocationModel> rpLocation = dataProductModel.getReplicaLocations()
+ .stream().filter(rpModel -> rpModel.getReplicaLocationCategory().
+ equals(ReplicaLocationCategory.GATEWAY_DATA_STORE)).findFirst();
+ if (rpLocation.isPresent()) {
+ pi.setValue(rpLocation.get().getFilePath());
+ pi.setStorageResourceId(rpLocation.get().getStorageResourceId());
+ } else {
+ log.error("Could not find a replica for the URI " + pi.getValue());
+ }
+ } catch (ReplicaCatalogException e) {
+ log.error(e.getMessage(), e);
+ }
+ } else if (pi.getType().equals(DataType.URI_COLLECTION) && pi.getValue().contains("airavata-dp://")) {
+ try {
+ String[] uriList = pi.getValue().split(",");
+ final ArrayList<String> filePathList = new ArrayList<>();
+ for (String uri : uriList) {
+ if (uri.startsWith("airavata-dp://")) {
+ DataProductModel dataProductModel = replicaCatalog.getDataProduct(uri);
+ Optional<DataReplicaLocationModel> rpLocation = dataProductModel.getReplicaLocations()
+ .stream().filter(rpModel -> rpModel.getReplicaLocationCategory().
+ equals(ReplicaLocationCategory.GATEWAY_DATA_STORE)).findFirst();
+ if (rpLocation.isPresent()) {
+ filePathList.add(rpLocation.get().getFilePath());
+ } else {
+ log.error("Could not find a replica for the URI " + pi.getValue());
+ }
+ } else {
+ // uri is in file path format
+ filePathList.add(uri);
+ }
+ }
+ pi.setValue(StringUtils.join(filePathList, ','));
} catch (ReplicaCatalogException e) {
log.error(e.getMessage(), e);
}
[13/53] [abbrv] airavata git commit: removing redundant experiment
search API methods
Posted by sh...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/c9ddaeb3/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 8de0958..670de62 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
@@ -52,11 +52,6 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
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(' getExperimentsInProject(AuthzToken authzToken, string projectId, i32 limit, i32 offset)')
@@ -395,36 +390,6 @@ elif cmd == 'searchProjectsByProjectDesc':
sys.exit(1)
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) != 6:
- print('searchExperimentsByName requires 6 args')
- sys.exit(1)
- 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) != 6:
- print('searchExperimentsByDesc requires 6 args')
- sys.exit(1)
- 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) != 6:
- print('searchExperimentsByApplication requires 6 args')
- sys.exit(1)
- 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) != 6:
- print('searchExperimentsByStatus requires 6 args')
- sys.exit(1)
- 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) != 7:
- print('searchExperimentsByCreationTime requires 7 args')
- sys.exit(1)
- 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:
print('searchExperiments requires 6 args')