You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/11/16 17:38:46 UTC
[1/6] airavata git commit: adding getDetailedExperimentTree method
Repository: airavata
Updated Branches:
refs/heads/master dd32d065e -> ee330724f
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 7ce1e58..f31503c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 aae8eaf..6119db1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 3b671c8..605e865 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 1d45616..f021d29 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 84cd4c2..0e72e4b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 7dd5131..bb3821b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 71cbfd4..f5f7726 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 0dccfb45..3ac88da 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 dd15bec..a18b2c2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 9b7b010..e43abc9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 8acb9ed..6a106c6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 a9604d0..4b7ac73 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 a350abb..b19987d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 40c2da6..491734e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 7a581c2..386c44d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 308e76a..4e432b5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 46a334a..f3705eb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 70e5f7a..6bc48bd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 f3aef70..76aeb2b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 1bde023..424cf02 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 706ab3e..d508139 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 c37c098..047b555 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 1a60586..7640e39 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 4568d4a..2464f48 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 ec19ca4..4ff6c4f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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");
@@ -73,6 +73,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
private static final org.apache.thrift.protocol.TField TASK_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDetail", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField SUB_TASK_MODEL_FIELD_DESC = new org.apache.thrift.protocol.TField("subTaskModel", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField TASK_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("taskError", org.apache.thrift.protocol.TType.STRUCT, (short)9);
+ private static final org.apache.thrift.protocol.TField JOBS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobs", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -89,6 +90,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
private String taskDetail; // optional
private ByteBuffer subTaskModel; // optional
private org.apache.airavata.model.commons.ErrorModel taskError; // optional
+ private List<org.apache.airavata.model.job.JobModel> jobs; // 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 {
@@ -104,7 +106,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
TASK_STATUS((short)6, "taskStatus"),
TASK_DETAIL((short)7, "taskDetail"),
SUB_TASK_MODEL((short)8, "subTaskModel"),
- TASK_ERROR((short)9, "taskError");
+ TASK_ERROR((short)9, "taskError"),
+ JOBS((short)10, "jobs");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -137,6 +140,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return SUB_TASK_MODEL;
case 9: // TASK_ERROR
return TASK_ERROR;
+ case 10: // JOBS
+ return JOBS;
default:
return null;
}
@@ -180,7 +185,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
private static final int __CREATIONTIME_ISSET_ID = 0;
private static final int __LASTUPDATETIME_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.SUB_TASK_MODEL,_Fields.TASK_ERROR};
+ private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.SUB_TASK_MODEL,_Fields.TASK_ERROR,_Fields.JOBS};
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);
@@ -202,6 +207,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
tmpMap.put(_Fields.TASK_ERROR, new org.apache.thrift.meta_data.FieldMetaData("taskError", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class)));
+ tmpMap.put(_Fields.JOBS, new org.apache.thrift.meta_data.FieldMetaData("jobs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.job.JobModel.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TaskModel.class, metaDataMap);
}
@@ -258,6 +266,13 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (other.isSetTaskError()) {
this.taskError = new org.apache.airavata.model.commons.ErrorModel(other.taskError);
}
+ if (other.isSetJobs()) {
+ List<org.apache.airavata.model.job.JobModel> __this__jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(other.jobs.size());
+ for (org.apache.airavata.model.job.JobModel other_element : other.jobs) {
+ __this__jobs.add(new org.apache.airavata.model.job.JobModel(other_element));
+ }
+ this.jobs = __this__jobs;
+ }
}
public TaskModel deepCopy() {
@@ -278,6 +293,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
this.taskDetail = null;
this.subTaskModel = null;
this.taskError = null;
+ this.jobs = null;
}
public String getTaskId() {
@@ -502,6 +518,44 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
}
+ public int getJobsSize() {
+ return (this.jobs == null) ? 0 : this.jobs.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.job.JobModel> getJobsIterator() {
+ return (this.jobs == null) ? null : this.jobs.iterator();
+ }
+
+ public void addToJobs(org.apache.airavata.model.job.JobModel elem) {
+ if (this.jobs == null) {
+ this.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>();
+ }
+ this.jobs.add(elem);
+ }
+
+ public List<org.apache.airavata.model.job.JobModel> getJobs() {
+ return this.jobs;
+ }
+
+ public void setJobs(List<org.apache.airavata.model.job.JobModel> jobs) {
+ this.jobs = jobs;
+ }
+
+ public void unsetJobs() {
+ this.jobs = null;
+ }
+
+ /** Returns true if field jobs is set (has been assigned a value) and false otherwise */
+ public boolean isSetJobs() {
+ return this.jobs != null;
+ }
+
+ public void setJobsIsSet(boolean value) {
+ if (!value) {
+ this.jobs = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TASK_ID:
@@ -576,6 +630,14 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
break;
+ case JOBS:
+ if (value == null) {
+ unsetJobs();
+ } else {
+ setJobs((List<org.apache.airavata.model.job.JobModel>)value);
+ }
+ break;
+
}
}
@@ -608,6 +670,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
case TASK_ERROR:
return getTaskError();
+ case JOBS:
+ return getJobs();
+
}
throw new IllegalStateException();
}
@@ -637,6 +702,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return isSetSubTaskModel();
case TASK_ERROR:
return isSetTaskError();
+ case JOBS:
+ return isSetJobs();
}
throw new IllegalStateException();
}
@@ -735,6 +802,15 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return false;
}
+ boolean this_present_jobs = true && this.isSetJobs();
+ boolean that_present_jobs = true && that.isSetJobs();
+ if (this_present_jobs || that_present_jobs) {
+ if (!(this_present_jobs && that_present_jobs))
+ return false;
+ if (!this.jobs.equals(that.jobs))
+ return false;
+ }
+
return true;
}
@@ -787,6 +863,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (present_taskError)
list.add(taskError);
+ boolean present_jobs = true && (isSetJobs());
+ list.add(present_jobs);
+ if (present_jobs)
+ list.add(jobs);
+
return list.hashCode();
}
@@ -888,6 +969,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetJobs()).compareTo(other.isSetJobs());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetJobs()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobs, other.jobs);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -977,6 +1068,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
first = false;
}
+ if (isSetJobs()) {
+ if (!first) sb.append(", ");
+ sb.append("jobs:");
+ if (this.jobs == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.jobs);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1126,6 +1227,25 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 10: // JOBS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list0.size);
+ org.apache.airavata.model.job.JobModel _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new org.apache.airavata.model.job.JobModel();
+ _elem1.read(iprot);
+ struct.jobs.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
+ struct.setJobsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1186,6 +1306,20 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeFieldEnd();
}
}
+ if (struct.jobs != null) {
+ if (struct.isSetJobs()) {
+ oprot.writeFieldBegin(JOBS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobs.size()));
+ for (org.apache.airavata.model.job.JobModel _iter3 : struct.jobs)
+ {
+ _iter3.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1219,7 +1353,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (struct.isSetTaskError()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetJobs()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetTaskDetail()) {
oprot.writeString(struct.taskDetail);
}
@@ -1229,6 +1366,15 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (struct.isSetTaskError()) {
struct.taskError.write(oprot);
}
+ if (struct.isSetJobs()) {
+ {
+ oprot.writeI32(struct.jobs.size());
+ for (org.apache.airavata.model.job.JobModel _iter4 : struct.jobs)
+ {
+ _iter4.write(oprot);
+ }
+ }
+ }
}
@Override
@@ -1247,7 +1393,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
struct.taskStatus = new org.apache.airavata.model.status.TaskStatus();
struct.taskStatus.read(iprot);
struct.setTaskStatusIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.taskDetail = iprot.readString();
struct.setTaskDetailIsSet(true);
@@ -1261,6 +1407,20 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
struct.taskError.read(iprot);
struct.setTaskErrorIsSet(true);
}
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list5.size);
+ org.apache.airavata.model.job.JobModel _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ {
+ _elem6 = new org.apache.airavata.model.job.JobModel();
+ _elem6.read(iprot);
+ struct.jobs.add(_elem6);
+ }
+ }
+ struct.setJobsIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 d90b240..1c273c7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 83f253c..f748890 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 21c24c8..49e2d45 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 edd9192..dadb543 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index 20689f4..8ce2174 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -605,6 +605,50 @@ service Airavata {
4: airavata_errors.AiravataSystemException ase,
5: airavata_errors.AuthorizationException ae)
+
+ /**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ */
+ experiment_model.ExperimentModel getDetailedExperimentTree(1: required security_model.AuthzToken authzToken,
+ 2: required string airavataExperimentId)
+ throws (1: airavata_errors.InvalidRequestException ire,
+ 2: airavata_errors.ExperimentNotFoundException enf,
+ 3: airavata_errors.AiravataClientException ace,
+ 4: airavata_errors.AiravataSystemException ase,
+ 5: airavata_errors.AuthorizationException ae)
+
+
/**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/thrift-interface-descriptions/airavata-api/experiment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/experiment_model.thrift b/thrift-interface-descriptions/airavata-api/experiment_model.thrift
index eeb9b86..fa15459 100644
--- a/thrift-interface-descriptions/airavata-api/experiment_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/experiment_model.thrift
@@ -22,6 +22,7 @@
include "scheduling_model.thrift"
include "airavata_commons.thrift"
include "status_models.thrift"
+ include "process_model.thrift"
namespace java org.apache.airavata.model.experiment
namespace php Airavata.Model.Experiment
@@ -91,7 +92,8 @@ struct ExperimentModel {
14: optional list<application_io_models.InputDataObjectType> experimentInputs,
15: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
16: optional status_models.ExperimentStatus experimentStatus,
- 17: optional list<airavata_commons.ErrorModel> errors
+ 17: optional list<airavata_commons.ErrorModel> errors,
+ 18: optional list<process_model.ProcessModel> processes
}
struct ExperimentSummaryModel {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/thrift-interface-descriptions/airavata-api/task_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/task_model.thrift b/thrift-interface-descriptions/airavata-api/task_model.thrift
index b2897cc..239a868 100644
--- a/thrift-interface-descriptions/airavata-api/task_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/task_model.thrift
@@ -22,6 +22,7 @@ include "airavata_commons.thrift"
include "status_models.thrift"
include "compute_resource_model.thrift"
include "application_io_models.thrift"
+include "job_model.thrift"
namespace java org.apache.airavata.model.task
namespace php Airavata.Model.Task
@@ -58,7 +59,8 @@ struct TaskModel {
6: required status_models.TaskStatus taskStatus,
7: optional string taskDetail,
8: optional binary subTaskModel,
- 9: optional airavata_commons.ErrorModel taskError
+ 9: optional airavata_commons.ErrorModel taskError,
+ 10: optional list<job_model.JobModel> jobs
}
/**
[3/6] airavata git commit: adding getDetailedExperimentTree method
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
index 2ed2405..c8c7cd5 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
@@ -36,6 +36,7 @@
#include "status_models_types.h"
#include "compute_resource_model_types.h"
#include "application_io_models_types.h"
+#include "job_model_types.h"
namespace apache { namespace airavata { namespace model { namespace task {
@@ -72,17 +73,18 @@ class JobSubmissionTaskModel;
class MonitorTaskModel;
typedef struct _TaskModel__isset {
- _TaskModel__isset() : taskDetail(false), subTaskModel(false), taskError(false) {}
+ _TaskModel__isset() : taskDetail(false), subTaskModel(false), taskError(false), jobs(false) {}
bool taskDetail :1;
bool subTaskModel :1;
bool taskError :1;
+ bool jobs :1;
} _TaskModel__isset;
class TaskModel {
public:
- static const char* ascii_fingerprint; // = "CE3A1BEFC350140F2B4D2EF1424A7C4F";
- static const uint8_t binary_fingerprint[16]; // = {0xCE,0x3A,0x1B,0xEF,0xC3,0x50,0x14,0x0F,0x2B,0x4D,0x2E,0xF1,0x42,0x4A,0x7C,0x4F};
+ static const char* ascii_fingerprint; // = "BA52131C9C867CBF7281F29EDD7DDB6F";
+ static const uint8_t binary_fingerprint[16]; // = {0xBA,0x52,0x13,0x1C,0x9C,0x86,0x7C,0xBF,0x72,0x81,0xF2,0x9E,0xDD,0x7D,0xDB,0x6F};
TaskModel(const TaskModel&);
TaskModel& operator=(const TaskModel&);
@@ -99,6 +101,7 @@ class TaskModel {
std::string taskDetail;
std::string subTaskModel;
::apache::airavata::model::commons::ErrorModel taskError;
+ std::vector< ::apache::airavata::model::job::JobModel> jobs;
_TaskModel__isset __isset;
@@ -120,6 +123,8 @@ class TaskModel {
void __set_taskError(const ::apache::airavata::model::commons::ErrorModel& val);
+ void __set_jobs(const std::vector< ::apache::airavata::model::job::JobModel> & val);
+
bool operator == (const TaskModel & rhs) const
{
if (!(taskId == rhs.taskId))
@@ -146,6 +151,10 @@ class TaskModel {
return false;
else if (__isset.taskError && !(taskError == rhs.taskError))
return false;
+ if (__isset.jobs != rhs.__isset.jobs)
+ return false;
+ else if (__isset.jobs && !(jobs == rhs.jobs))
+ return false;
return true;
}
bool operator != (const TaskModel &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 edf5211..c3d3122 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
@@ -634,6 +634,64 @@ interface AiravataIf {
*/
public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
+ *
+ * userName:
+ * The user name of the targeted gateway end user on whose behalf the experiment is being created.
+ * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
+ * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
+ * Airavata, an authorization exception is thrown.
+ *
+ * experimentName:
+ * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
+ * by the generated experiment id.
+ *
+ * experimentDescription:
+ * The verbose description of the experiment. This is an optional parameter.
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\ExperimentNotFoundException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -4536,6 +4594,73 @@ class AiravataClient implements \Airavata\API\AiravataIf {
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);
@@ -20265,6 +20390,314 @@ class Airavata_getExperiment_result {
}
+class Airavata_getDetailedExperimentTree_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $airavataExperimentId = 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' => 'airavataExperimentId',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['airavataExperimentId'])) {
+ $this->airavataExperimentId = $vals['airavataExperimentId'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getDetailedExperimentTree_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->airavataExperimentId);
+ } 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_getDetailedExperimentTree_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->airavataExperimentId !== null) {
+ $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
+ $xfer += $output->writeString($this->airavataExperimentId);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getDetailedExperimentTree_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Experiment\ExperimentModel
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\ExperimentNotFoundException
+ */
+ public $enf = 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::STRUCT,
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'enf',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\ExperimentNotFoundException',
+ ),
+ 3 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 4 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 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['enf'])) {
+ $this->enf = $vals['enf'];
+ }
+ 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_getDetailedExperimentTree_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::STRUCT) {
+ $this->success = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $this->success->read($input);
+ } 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->enf = new \Airavata\API\Error\ExperimentNotFoundException();
+ $xfer += $this->enf->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->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_getDetailedExperimentTree_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();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->enf !== null) {
+ $xfer += $output->writeFieldBegin('enf', TType::STRUCT, 2);
+ $xfer += $this->enf->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 3);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 4);
+ $xfer += $this->ase->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_updateExperiment_args {
static $_TSPEC;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 fd56220..d01c0d0 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
@@ -355,6 +355,10 @@ class ExperimentModel {
* @var \Airavata\Model\Commons\ErrorModel[]
*/
public $errors = null;
+ /**
+ * @var \Airavata\Model\Process\ProcessModel[]
+ */
+ public $processes = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -448,6 +452,15 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
+ 18 => array(
+ 'var' => 'processes',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Process\ProcessModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -502,6 +515,9 @@ class ExperimentModel {
if (isset($vals['errors'])) {
$this->errors = $vals['errors'];
}
+ if (isset($vals['processes'])) {
+ $this->processes = $vals['processes'];
+ }
}
}
@@ -688,6 +704,24 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
+ case 18:
+ if ($ftype == TType::LST) {
+ $this->processes = array();
+ $_size24 = 0;
+ $_etype27 = 0;
+ $xfer += $input->readListBegin($_etype27, $_size24);
+ for ($_i28 = 0; $_i28 < $_size24; ++$_i28)
+ {
+ $elem29 = null;
+ $elem29 = new \Airavata\Model\Process\ProcessModel();
+ $xfer += $elem29->read($input);
+ $this->processes []= $elem29;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -764,9 +798,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
- foreach ($this->emailAddresses as $iter24)
+ foreach ($this->emailAddresses as $iter30)
{
- $xfer += $output->writeString($iter24);
+ $xfer += $output->writeString($iter30);
}
}
$output->writeListEnd();
@@ -789,9 +823,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
- foreach ($this->experimentInputs as $iter25)
+ foreach ($this->experimentInputs as $iter31)
{
- $xfer += $iter25->write($output);
+ $xfer += $iter31->write($output);
}
}
$output->writeListEnd();
@@ -806,9 +840,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
- foreach ($this->experimentOutputs as $iter26)
+ foreach ($this->experimentOutputs as $iter32)
{
- $xfer += $iter26->write($output);
+ $xfer += $iter32->write($output);
}
}
$output->writeListEnd();
@@ -831,9 +865,26 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
- foreach ($this->errors as $iter27)
+ foreach ($this->errors as $iter33)
+ {
+ $xfer += $iter33->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->processes !== null) {
+ if (!is_array($this->processes)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->processes));
+ {
+ foreach ($this->processes as $iter34)
{
- $xfer += $iter27->write($output);
+ $xfer += $iter34->write($output);
}
}
$output->writeListEnd();
@@ -1391,15 +1442,15 @@ class ExperimentStatistics {
case 7:
if ($ftype == TType::LST) {
$this->allExperiments = array();
- $_size28 = 0;
- $_etype31 = 0;
- $xfer += $input->readListBegin($_etype31, $_size28);
- for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readListBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem33 = null;
- $elem33 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem33->read($input);
- $this->allExperiments []= $elem33;
+ $elem40 = null;
+ $elem40 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem40->read($input);
+ $this->allExperiments []= $elem40;
}
$xfer += $input->readListEnd();
} else {
@@ -1409,15 +1460,15 @@ class ExperimentStatistics {
case 8:
if ($ftype == TType::LST) {
$this->completedExperiments = array();
- $_size34 = 0;
- $_etype37 = 0;
- $xfer += $input->readListBegin($_etype37, $_size34);
- for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
+ $_size41 = 0;
+ $_etype44 = 0;
+ $xfer += $input->readListBegin($_etype44, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $elem39 = null;
- $elem39 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem39->read($input);
- $this->completedExperiments []= $elem39;
+ $elem46 = null;
+ $elem46 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem46->read($input);
+ $this->completedExperiments []= $elem46;
}
$xfer += $input->readListEnd();
} else {
@@ -1427,15 +1478,15 @@ class ExperimentStatistics {
case 9:
if ($ftype == TType::LST) {
$this->failedExperiments = array();
- $_size40 = 0;
- $_etype43 = 0;
- $xfer += $input->readListBegin($_etype43, $_size40);
- for ($_i44 = 0; $_i44 < $_size40; ++$_i44)
+ $_size47 = 0;
+ $_etype50 = 0;
+ $xfer += $input->readListBegin($_etype50, $_size47);
+ for ($_i51 = 0; $_i51 < $_size47; ++$_i51)
{
- $elem45 = null;
- $elem45 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem45->read($input);
- $this->failedExperiments []= $elem45;
+ $elem52 = null;
+ $elem52 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem52->read($input);
+ $this->failedExperiments []= $elem52;
}
$xfer += $input->readListEnd();
} else {
@@ -1445,15 +1496,15 @@ class ExperimentStatistics {
case 10:
if ($ftype == TType::LST) {
$this->cancelledExperiments = 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\Experiment\ExperimentSummaryModel();
- $xfer += $elem51->read($input);
- $this->cancelledExperiments []= $elem51;
+ $elem58 = null;
+ $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem58->read($input);
+ $this->cancelledExperiments []= $elem58;
}
$xfer += $input->readListEnd();
} else {
@@ -1463,15 +1514,15 @@ class ExperimentStatistics {
case 11:
if ($ftype == TType::LST) {
$this->createdExperiments = array();
- $_size52 = 0;
- $_etype55 = 0;
- $xfer += $input->readListBegin($_etype55, $_size52);
- for ($_i56 = 0; $_i56 < $_size52; ++$_i56)
+ $_size59 = 0;
+ $_etype62 = 0;
+ $xfer += $input->readListBegin($_etype62, $_size59);
+ for ($_i63 = 0; $_i63 < $_size59; ++$_i63)
{
- $elem57 = null;
- $elem57 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem57->read($input);
- $this->createdExperiments []= $elem57;
+ $elem64 = null;
+ $elem64 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem64->read($input);
+ $this->createdExperiments []= $elem64;
}
$xfer += $input->readListEnd();
} else {
@@ -1481,15 +1532,15 @@ class ExperimentStatistics {
case 12:
if ($ftype == TType::LST) {
$this->runningExperiments = array();
- $_size58 = 0;
- $_etype61 = 0;
- $xfer += $input->readListBegin($_etype61, $_size58);
- for ($_i62 = 0; $_i62 < $_size58; ++$_i62)
+ $_size65 = 0;
+ $_etype68 = 0;
+ $xfer += $input->readListBegin($_etype68, $_size65);
+ for ($_i69 = 0; $_i69 < $_size65; ++$_i69)
{
- $elem63 = null;
- $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem63->read($input);
- $this->runningExperiments []= $elem63;
+ $elem70 = null;
+ $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem70->read($input);
+ $this->runningExperiments []= $elem70;
}
$xfer += $input->readListEnd();
} else {
@@ -1547,9 +1598,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->allExperiments));
{
- foreach ($this->allExperiments as $iter64)
+ foreach ($this->allExperiments as $iter71)
{
- $xfer += $iter64->write($output);
+ $xfer += $iter71->write($output);
}
}
$output->writeListEnd();
@@ -1564,9 +1615,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->completedExperiments));
{
- foreach ($this->completedExperiments as $iter65)
+ foreach ($this->completedExperiments as $iter72)
{
- $xfer += $iter65->write($output);
+ $xfer += $iter72->write($output);
}
}
$output->writeListEnd();
@@ -1581,9 +1632,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->failedExperiments));
{
- foreach ($this->failedExperiments as $iter66)
+ foreach ($this->failedExperiments as $iter73)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter73->write($output);
}
}
$output->writeListEnd();
@@ -1598,9 +1649,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->cancelledExperiments));
{
- foreach ($this->cancelledExperiments as $iter67)
+ foreach ($this->cancelledExperiments as $iter74)
{
- $xfer += $iter67->write($output);
+ $xfer += $iter74->write($output);
}
}
$output->writeListEnd();
@@ -1615,9 +1666,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->createdExperiments));
{
- foreach ($this->createdExperiments as $iter68)
+ foreach ($this->createdExperiments as $iter75)
{
- $xfer += $iter68->write($output);
+ $xfer += $iter75->write($output);
}
}
$output->writeListEnd();
@@ -1632,9 +1683,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->runningExperiments));
{
- foreach ($this->runningExperiments as $iter69)
+ foreach ($this->runningExperiments as $iter76)
{
- $xfer += $iter69->write($output);
+ $xfer += $iter76->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
index 2e3f678..6d666f1 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
@@ -100,6 +100,10 @@ class TaskModel {
* @var \Airavata\Model\Commons\ErrorModel
*/
public $taskError = null;
+ /**
+ * @var \Airavata\Model\Job\JobModel[]
+ */
+ public $jobs = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -142,6 +146,15 @@ class TaskModel {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Commons\ErrorModel',
),
+ 10 => array(
+ 'var' => 'jobs',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Job\JobModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -172,6 +185,9 @@ class TaskModel {
if (isset($vals['taskError'])) {
$this->taskError = $vals['taskError'];
}
+ if (isset($vals['jobs'])) {
+ $this->jobs = $vals['jobs'];
+ }
}
}
@@ -259,6 +275,24 @@ class TaskModel {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::LST) {
+ $this->jobs = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem5->read($input);
+ $this->jobs []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -323,6 +357,23 @@ class TaskModel {
$xfer += $this->taskError->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->jobs !== null) {
+ if (!is_array($this->jobs)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('jobs', TType::LST, 10);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->jobs));
+ {
+ foreach ($this->jobs as $iter6)
+ {
+ $xfer += $iter6->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 1e6a3c0..56b71af 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
@@ -53,6 +53,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' string createExperiment(AuthzToken authzToken, string gatewayId, ExperimentModel experiment)')
print(' bool deleteExperiment(AuthzToken authzToken, string experimentId)')
print(' ExperimentModel getExperiment(AuthzToken authzToken, string airavataExperimentId)')
+ print(' ExperimentModel getDetailedExperimentTree(AuthzToken authzToken, string airavataExperimentId)')
print(' void updateExperiment(AuthzToken authzToken, string airavataExperimentId, ExperimentModel experiment)')
print(' void updateExperimentConfiguration(AuthzToken authzToken, string airavataExperimentId, UserConfigurationDataModel userConfiguration)')
print(' void updateResourceScheduleing(AuthzToken authzToken, string airavataExperimentId, ComputationalResourceSchedulingModel resourceScheduling)')
@@ -378,6 +379,12 @@ elif cmd == 'getExperiment':
sys.exit(1)
pp.pprint(client.getExperiment(eval(args[0]),args[1],))
+elif cmd == 'getDetailedExperimentTree':
+ if len(args) != 2:
+ print('getDetailedExperimentTree requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.getDetailedExperimentTree(eval(args[0]),args[1],))
+
elif cmd == 'updateExperiment':
if len(args) != 3:
print('updateExperiment requires 3 args')
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 b7813c6..eb70fc4 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
@@ -562,6 +562,47 @@ class Iface:
"""
pass
+ def getDetailedExperimentTree(self, authzToken, airavataExperimentId):
+ """
+ Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ tasks -> jobs information.
+
+ @param airavataExperimentId
+ The identifier for the requested experiment. This is returned during the create experiment step.
+
+ @return experimentMetada
+ This method will return the previously stored experiment metadata.
+
+ @throws org.apache.airavata.model.error.InvalidRequestException
+ For any incorrect forming of the request itself.
+
+ @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+
+ @throws org.apache.airavata.model.error.AiravataClientException
+ The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+
+ UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ gateway registration steps and retry this request.
+
+ AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ For now this is a place holder.
+
+ INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ is implemented, the authorization will be more substantial.
+
+ @throws org.apache.airavata.model.error.AiravataSystemException
+ This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ rather an Airavata Administrator will be notified to take corrective action.
+
+
+ Parameters:
+ - authzToken
+ - airavataExperimentId
+ """
+ pass
+
def updateExperiment(self, authzToken, airavataExperimentId, experiment):
"""
Configure a previously created experiment with required inputs, scheduling and other quality of service
@@ -3719,6 +3760,82 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getExperiment failed: unknown result");
+ def getDetailedExperimentTree(self, authzToken, airavataExperimentId):
+ """
+ Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ tasks -> jobs information.
+
+ @param airavataExperimentId
+ The identifier for the requested experiment. This is returned during the create experiment step.
+
+ @return experimentMetada
+ This method will return the previously stored experiment metadata.
+
+ @throws org.apache.airavata.model.error.InvalidRequestException
+ For any incorrect forming of the request itself.
+
+ @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+
+ @throws org.apache.airavata.model.error.AiravataClientException
+ The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+
+ UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ gateway registration steps and retry this request.
+
+ AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ For now this is a place holder.
+
+ INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ is implemented, the authorization will be more substantial.
+
+ @throws org.apache.airavata.model.error.AiravataSystemException
+ This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ rather an Airavata Administrator will be notified to take corrective action.
+
+
+ Parameters:
+ - authzToken
+ - airavataExperimentId
+ """
+ self.send_getDetailedExperimentTree(authzToken, airavataExperimentId)
+ return self.recv_getDetailedExperimentTree()
+
+ def send_getDetailedExperimentTree(self, authzToken, airavataExperimentId):
+ self._oprot.writeMessageBegin('getDetailedExperimentTree', TMessageType.CALL, self._seqid)
+ args = getDetailedExperimentTree_args()
+ args.authzToken = authzToken
+ args.airavataExperimentId = airavataExperimentId
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
+ def recv_getDetailedExperimentTree(self):
+ iprot = self._iprot
+ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
+ x.read(iprot)
+ iprot.readMessageEnd()
+ raise x
+ result = getDetailedExperimentTree_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.enf is not None:
+ raise result.enf
+ 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, "getDetailedExperimentTree failed: unknown result");
+
def updateExperiment(self, authzToken, airavataExperimentId, experiment):
"""
Configure a previously created experiment with required inputs, scheduling and other quality of service
@@ -8541,6 +8658,7 @@ class Processor(Iface, TProcessor):
self._processMap["createExperiment"] = Processor.process_createExperiment
self._processMap["deleteExperiment"] = Processor.process_deleteExperiment
self._processMap["getExperiment"] = Processor.process_getExperiment
+ self._processMap["getDetailedExperimentTree"] = Processor.process_getDetailedExperimentTree
self._processMap["updateExperiment"] = Processor.process_updateExperiment
self._processMap["updateExperimentConfiguration"] = Processor.process_updateExperimentConfiguration
self._processMap["updateResourceScheduleing"] = Processor.process_updateResourceScheduleing
@@ -9236,6 +9354,28 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
+ def process_getDetailedExperimentTree(self, seqid, iprot, oprot):
+ args = getDetailedExperimentTree_args()
+ args.read(iprot)
+ iprot.readMessageEnd()
+ result = getDetailedExperimentTree_result()
+ try:
+ result.success = self._handler.getDetailedExperimentTree(args.authzToken, args.airavataExperimentId)
+ except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
+ result.ire = ire
+ except apache.airavata.api.error.ttypes.ExperimentNotFoundException, enf:
+ result.enf = enf
+ except apache.airavata.api.error.ttypes.AiravataClientException, ace:
+ result.ace = ace
+ except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
+ result.ase = ase
+ except apache.airavata.api.error.ttypes.AuthorizationException, ae:
+ result.ae = ae
+ oprot.writeMessageBegin("getDetailedExperimentTree", TMessageType.REPLY, seqid)
+ result.write(oprot)
+ oprot.writeMessageEnd()
+ oprot.trans.flush()
+
def process_updateExperiment(self, seqid, iprot, oprot):
args = updateExperiment_args()
args.read(iprot)
@@ -17878,6 +18018,224 @@ class getExperiment_result:
def __ne__(self, other):
return not (self == other)
+class getDetailedExperimentTree_args:
+ """
+ Attributes:
+ - authzToken
+ - airavataExperimentId
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
+ )
+
+ def __init__(self, authzToken=None, airavataExperimentId=None,):
+ self.authzToken = authzToken
+ self.airavataExperimentId = airavataExperimentId
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRING:
+ self.airavataExperimentId = iprot.readString();
+ else:
+ iprot.skip(ftype)
+ 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('getDetailedExperimentTree_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
+ if self.airavataExperimentId is not None:
+ oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
+ oprot.writeString(self.airavataExperimentId)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.authzToken is None:
+ raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
+ if self.airavataExperimentId is None:
+ raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.authzToken)
+ value = (value * 31) ^ hash(self.airavataExperimentId)
+ 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 getDetailedExperimentTree_result:
+ """
+ Attributes:
+ - success
+ - ire
+ - enf
+ - ace
+ - ase
+ - ae
+ """
+
+ thrift_spec = (
+ (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ), # 0
+ (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 4
+ (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 5
+ )
+
+ def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
+ self.success = success
+ self.ire = ire
+ self.enf = enf
+ self.ace = ace
+ self.ase = ase
+ self.ae = ae
+
+ def read(self, iprot):
+ 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.STRUCT:
+ self.success = apache.airavata.model.experiment.ttypes.ExperimentModel()
+ self.success.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+ self.enf.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRUCT:
+ self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ 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('getDetailedExperimentTree_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ire is not None:
+ oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+ self.ire.write(oprot)
+ oprot.writeFieldEnd()
+ if self.enf is not None:
+ oprot.writeFieldBegin('enf', TType.STRUCT, 2)
+ self.enf.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ace is not None:
+ oprot.writeFieldBegin('ace', TType.STRUCT, 3)
+ self.ace.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ase is not None:
+ oprot.writeFieldBegin('ase', TType.STRUCT, 4)
+ self.ase.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 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.enf)
+ value = (value * 31) ^ hash(self.ace)
+ value = (value * 31) ^ hash(self.ase)
+ value = (value * 31) ^ hash(self.ae)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
class updateExperiment_args:
"""
Attributes:
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 779a25a..a447541 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
@@ -11,6 +11,7 @@ import apache.airavata.model.application.io.ttypes
import apache.airavata.model.scheduling.ttypes
import apache.airavata.model.commons.ttypes
import apache.airavata.model.status.ttypes
+import apache.airavata.model.process.ttypes
from thrift.transport import TTransport
@@ -252,6 +253,7 @@ class ExperimentModel:
- experimentOutputs
- experimentStatus
- errors
+ - processes
"""
thrift_spec = (
@@ -273,9 +275,10 @@ class ExperimentModel:
(15, TType.LIST, 'experimentOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 15
(16, TType.STRUCT, 'experimentStatus', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 16
(17, TType.LIST, 'errors', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 17
+ (18, TType.LIST, 'processes', (TType.STRUCT,(apache.airavata.model.process.ttypes.ProcessModel, apache.airavata.model.process.ttypes.ProcessModel.thrift_spec)), None, ), # 18
)
- def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None,):
+ def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None,):
self.experimentId = experimentId
self.projectId = projectId
self.gatewayId = gatewayId
@@ -293,6 +296,7 @@ class ExperimentModel:
self.experimentOutputs = experimentOutputs
self.experimentStatus = experimentStatus
self.errors = errors
+ self.processes = processes
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:
@@ -413,6 +417,17 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
+ elif fid == 18:
+ if ftype == TType.LIST:
+ self.processes = []
+ (_etype27, _size24) = iprot.readListBegin()
+ for _i28 in xrange(_size24):
+ _elem29 = apache.airavata.model.process.ttypes.ProcessModel()
+ _elem29.read(iprot)
+ self.processes.append(_elem29)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -470,8 +485,8 @@ class ExperimentModel:
if self.emailAddresses is not None:
oprot.writeFieldBegin('emailAddresses', TType.LIST, 12)
oprot.writeListBegin(TType.STRING, len(self.emailAddresses))
- for iter24 in self.emailAddresses:
- oprot.writeString(iter24)
+ for iter30 in self.emailAddresses:
+ oprot.writeString(iter30)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.userConfigurationData is not None:
@@ -481,15 +496,15 @@ class ExperimentModel:
if self.experimentInputs is not None:
oprot.writeFieldBegin('experimentInputs', TType.LIST, 14)
oprot.writeListBegin(TType.STRUCT, len(self.experimentInputs))
- for iter25 in self.experimentInputs:
- iter25.write(oprot)
+ for iter31 in self.experimentInputs:
+ iter31.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.experimentOutputs is not None:
oprot.writeFieldBegin('experimentOutputs', TType.LIST, 15)
oprot.writeListBegin(TType.STRUCT, len(self.experimentOutputs))
- for iter26 in self.experimentOutputs:
- iter26.write(oprot)
+ for iter32 in self.experimentOutputs:
+ iter32.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.experimentStatus is not None:
@@ -499,8 +514,15 @@ class ExperimentModel:
if self.errors is not None:
oprot.writeFieldBegin('errors', TType.LIST, 17)
oprot.writeListBegin(TType.STRUCT, len(self.errors))
- for iter27 in self.errors:
- iter27.write(oprot)
+ for iter33 in self.errors:
+ iter33.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.processes is not None:
+ oprot.writeFieldBegin('processes', TType.LIST, 18)
+ oprot.writeListBegin(TType.STRUCT, len(self.processes))
+ for iter34 in self.processes:
+ iter34.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -541,6 +563,7 @@ class ExperimentModel:
value = (value * 31) ^ hash(self.experimentOutputs)
value = (value * 31) ^ hash(self.experimentStatus)
value = (value * 31) ^ hash(self.errors)
+ value = (value * 31) ^ hash(self.processes)
return value
def __repr__(self):
@@ -849,66 +872,66 @@ class ExperimentStatistics:
elif fid == 7:
if ftype == TType.LIST:
self.allExperiments = []
- (_etype31, _size28) = iprot.readListBegin()
- for _i32 in xrange(_size28):
- _elem33 = ExperimentSummaryModel()
- _elem33.read(iprot)
- self.allExperiments.append(_elem33)
+ (_etype38, _size35) = iprot.readListBegin()
+ for _i39 in xrange(_size35):
+ _elem40 = ExperimentSummaryModel()
+ _elem40.read(iprot)
+ self.allExperiments.append(_elem40)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 8:
if ftype == TType.LIST:
self.completedExperiments = []
- (_etype37, _size34) = iprot.readListBegin()
- for _i38 in xrange(_size34):
- _elem39 = ExperimentSummaryModel()
- _elem39.read(iprot)
- self.completedExperiments.append(_elem39)
+ (_etype44, _size41) = iprot.readListBegin()
+ for _i45 in xrange(_size41):
+ _elem46 = ExperimentSummaryModel()
+ _elem46.read(iprot)
+ self.completedExperiments.append(_elem46)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 9:
if ftype == TType.LIST:
self.failedExperiments = []
- (_etype43, _size40) = iprot.readListBegin()
- for _i44 in xrange(_size40):
- _elem45 = ExperimentSummaryModel()
- _elem45.read(iprot)
- self.failedExperiments.append(_elem45)
+ (_etype50, _size47) = iprot.readListBegin()
+ for _i51 in xrange(_size47):
+ _elem52 = ExperimentSummaryModel()
+ _elem52.read(iprot)
+ self.failedExperiments.append(_elem52)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 10:
if ftype == TType.LIST:
self.cancelledExperiments = []
- (_etype49, _size46) = iprot.readListBegin()
- for _i50 in xrange(_size46):
- _elem51 = ExperimentSummaryModel()
- _elem51.read(iprot)
- self.cancelledExperiments.append(_elem51)
+ (_etype56, _size53) = iprot.readListBegin()
+ for _i57 in xrange(_size53):
+ _elem58 = ExperimentSummaryModel()
+ _elem58.read(iprot)
+ self.cancelledExperiments.append(_elem58)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 11:
if ftype == TType.LIST:
self.createdExperiments = []
- (_etype55, _size52) = iprot.readListBegin()
- for _i56 in xrange(_size52):
- _elem57 = ExperimentSummaryModel()
- _elem57.read(iprot)
- self.createdExperiments.append(_elem57)
+ (_etype62, _size59) = iprot.readListBegin()
+ for _i63 in xrange(_size59):
+ _elem64 = ExperimentSummaryModel()
+ _elem64.read(iprot)
+ self.createdExperiments.append(_elem64)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 12:
if ftype == TType.LIST:
self.runningExperiments = []
- (_etype61, _size58) = iprot.readListBegin()
- for _i62 in xrange(_size58):
- _elem63 = ExperimentSummaryModel()
- _elem63.read(iprot)
- self.runningExperiments.append(_elem63)
+ (_etype68, _size65) = iprot.readListBegin()
+ for _i69 in xrange(_size65):
+ _elem70 = ExperimentSummaryModel()
+ _elem70.read(iprot)
+ self.runningExperiments.append(_elem70)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -949,43 +972,43 @@ class ExperimentStatistics:
if self.allExperiments is not None:
oprot.writeFieldBegin('allExperiments', TType.LIST, 7)
oprot.writeListBegin(TType.STRUCT, len(self.allExperiments))
- for iter64 in self.allExperiments:
- iter64.write(oprot)
+ for iter71 in self.allExperiments:
+ iter71.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.completedExperiments is not None:
oprot.writeFieldBegin('completedExperiments', TType.LIST, 8)
oprot.writeListBegin(TType.STRUCT, len(self.completedExperiments))
- for iter65 in self.completedExperiments:
- iter65.write(oprot)
+ for iter72 in self.completedExperiments:
+ iter72.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.failedExperiments is not None:
oprot.writeFieldBegin('failedExperiments', TType.LIST, 9)
oprot.writeListBegin(TType.STRUCT, len(self.failedExperiments))
- for iter66 in self.failedExperiments:
- iter66.write(oprot)
+ for iter73 in self.failedExperiments:
+ iter73.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.cancelledExperiments is not None:
oprot.writeFieldBegin('cancelledExperiments', TType.LIST, 10)
oprot.writeListBegin(TType.STRUCT, len(self.cancelledExperiments))
- for iter67 in self.cancelledExperiments:
- iter67.write(oprot)
+ for iter74 in self.cancelledExperiments:
+ iter74.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.createdExperiments is not None:
oprot.writeFieldBegin('createdExperiments', TType.LIST, 11)
oprot.writeListBegin(TType.STRUCT, len(self.createdExperiments))
- for iter68 in self.createdExperiments:
- iter68.write(oprot)
+ for iter75 in self.createdExperiments:
+ iter75.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.runningExperiments is not None:
oprot.writeFieldBegin('runningExperiments', TType.LIST, 12)
oprot.writeListBegin(TType.STRUCT, len(self.runningExperiments))
- for iter69 in self.runningExperiments:
- iter69.write(oprot)
+ for iter76 in self.runningExperiments:
+ iter76.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
index 9ac820f..bef27d1 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
@@ -11,6 +11,7 @@ import apache.airavata.model.commons.ttypes
import apache.airavata.model.status.ttypes
import apache.airavata.model.appcatalog.computeresource.ttypes
import apache.airavata.model.application.io.ttypes
+import apache.airavata.model.job.ttypes
from thrift.transport import TTransport
@@ -90,6 +91,7 @@ class TaskModel:
- taskDetail
- subTaskModel
- taskError
+ - jobs
"""
thrift_spec = (
@@ -103,9 +105,10 @@ class TaskModel:
(7, TType.STRING, 'taskDetail', None, None, ), # 7
(8, TType.STRING, 'subTaskModel', None, None, ), # 8
(9, TType.STRUCT, 'taskError', (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), None, ), # 9
+ (10, TType.LIST, 'jobs', (TType.STRUCT,(apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec)), None, ), # 10
)
- def __init__(self, taskId=thrift_spec[1][4], taskType=None, parentProcessId=None, creationTime=None, lastUpdateTime=None, taskStatus=None, taskDetail=None, subTaskModel=None, taskError=None,):
+ def __init__(self, taskId=thrift_spec[1][4], taskType=None, parentProcessId=None, creationTime=None, lastUpdateTime=None, taskStatus=None, taskDetail=None, subTaskModel=None, taskError=None, jobs=None,):
self.taskId = taskId
self.taskType = taskType
self.parentProcessId = parentProcessId
@@ -115,6 +118,7 @@ class TaskModel:
self.taskDetail = taskDetail
self.subTaskModel = subTaskModel
self.taskError = taskError
+ self.jobs = jobs
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:
@@ -172,6 +176,17 @@ class TaskModel:
self.taskError.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.LIST:
+ self.jobs = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = apache.airavata.model.job.ttypes.JobModel()
+ _elem5.read(iprot)
+ self.jobs.append(_elem5)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -218,6 +233,13 @@ class TaskModel:
oprot.writeFieldBegin('taskError', TType.STRUCT, 9)
self.taskError.write(oprot)
oprot.writeFieldEnd()
+ if self.jobs is not None:
+ oprot.writeFieldBegin('jobs', TType.LIST, 10)
+ oprot.writeListBegin(TType.STRUCT, len(self.jobs))
+ for iter6 in self.jobs:
+ iter6.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -248,6 +270,7 @@ class TaskModel:
value = (value * 31) ^ hash(self.taskDetail)
value = (value * 31) ^ hash(self.subTaskModel)
value = (value * 31) ^ hash(self.taskError)
+ value = (value * 31) ^ hash(self.jobs)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index fa859f5..c640f9d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 060d8e9..c6cf8ee 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 5e2613f..a7fe0fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 2f2f470..8cdfa96 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 2158479..0b7459a 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 47f2397..5b0d2c5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 28e85e7..f5d2572 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 efa26aa..9fa426a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 8a2c21c..83ec157 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
index a08a27d..eb8d0cb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 fd5a9fe..64e91a7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index 1ed88a4..4283b0e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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");
[4/6] airavata git commit: adding getDetailedExperimentTree method
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 62bbc7e..1657af0 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
@@ -9728,6 +9728,314 @@ uint32_t Airavata_getExperiment_presult::read(::apache::thrift::protocol::TProto
}
+Airavata_getDetailedExperimentTree_args::~Airavata_getDetailedExperimentTree_args() throw() {
+}
+
+
+uint32_t Airavata_getDetailedExperimentTree_args::read(::apache::thrift::protocol::TProtocol* 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_airavataExperimentId = 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->airavataExperimentId);
+ isset_airavataExperimentId = 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_airavataExperimentId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_getDetailedExperimentTree_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ oprot->incrementRecursionDepth();
+ 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("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->airavataExperimentId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ oprot->decrementRecursionDepth();
+ return xfer;
+}
+
+
+Airavata_getDetailedExperimentTree_pargs::~Airavata_getDetailedExperimentTree_pargs() throw() {
+}
+
+
+uint32_t Airavata_getDetailedExperimentTree_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ oprot->incrementRecursionDepth();
+ 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("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->airavataExperimentId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ oprot->decrementRecursionDepth();
+ return xfer;
+}
+
+
+Airavata_getDetailedExperimentTree_result::~Airavata_getDetailedExperimentTree_result() throw() {
+}
+
+
+uint32_t Airavata_getDetailedExperimentTree_result::read(::apache::thrift::protocol::TProtocol* 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_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);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ 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 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = 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 {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_getDetailedExperimentTree_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_getDetailedExperimentTree_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) {
+ 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, 3);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ 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, 5);
+ xfer += this->ae.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+
+Airavata_getDetailedExperimentTree_presult::~Airavata_getDetailedExperimentTree_presult() throw() {
+}
+
+
+uint32_t Airavata_getDetailedExperimentTree_presult::read(::apache::thrift::protocol::TProtocol* 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_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);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ 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 4:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = 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 {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+
Airavata_updateExperiment_args::~Airavata_updateExperiment_args() throw() {
}
@@ -40857,6 +41165,80 @@ void AiravataClient::recv_getExperiment( ::apache::airavata::model::experiment::
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getExperiment failed: unknown result");
}
+void AiravataClient::getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+{
+ send_getDetailedExperimentTree(authzToken, airavataExperimentId);
+ recv_getDetailedExperimentTree(_return);
+}
+
+void AiravataClient::send_getDetailedExperimentTree(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("getDetailedExperimentTree", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ Airavata_getDetailedExperimentTree_pargs args;
+ args.authzToken = &authzToken;
+ args.airavataExperimentId = &airavataExperimentId;
+ args.write(oprot_);
+
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
+
+void AiravataClient::recv_getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return)
+{
+
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
+
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("getDetailedExperimentTree") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_getDetailedExperimentTree_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.enf) {
+ throw result.enf;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getDetailedExperimentTree failed: unknown result");
+}
+
void AiravataClient::updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment)
{
send_updateExperiment(authzToken, airavataExperimentId, experiment);
@@ -49574,6 +49956,75 @@ void AiravataProcessor::process_getExperiment(int32_t seqid, ::apache::thrift::p
}
}
+void AiravataProcessor::process_getDetailedExperimentTree(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+{
+ void* ctx = NULL;
+ if (this->eventHandler_.get() != NULL) {
+ ctx = this->eventHandler_->getContext("Airavata.getDetailedExperimentTree", callContext);
+ }
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getDetailedExperimentTree");
+
+ if (this->eventHandler_.get() != NULL) {
+ this->eventHandler_->preRead(ctx, "Airavata.getDetailedExperimentTree");
+ }
+
+ Airavata_getDetailedExperimentTree_args args;
+ args.read(iprot);
+ iprot->readMessageEnd();
+ uint32_t bytes = iprot->getTransport()->readEnd();
+
+ if (this->eventHandler_.get() != NULL) {
+ this->eventHandler_->postRead(ctx, "Airavata.getDetailedExperimentTree", bytes);
+ }
+
+ Airavata_getDetailedExperimentTree_result result;
+ try {
+ iface_->getDetailedExperimentTree(result.success, args.authzToken, args.airavataExperimentId);
+ result.__isset.success = true;
+ } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
+ result.ire = ire;
+ result.__isset.ire = true;
+ } catch ( ::apache::airavata::api::error::ExperimentNotFoundException &enf) {
+ result.enf = enf;
+ result.__isset.enf = true;
+ } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
+ result.ace = ace;
+ result.__isset.ace = true;
+ } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
+ result.ase = ase;
+ result.__isset.ase = true;
+ } catch ( ::apache::airavata::api::error::AuthorizationException &ae) {
+ result.ae = ae;
+ result.__isset.ae = true;
+ } catch (const std::exception& e) {
+ if (this->eventHandler_.get() != NULL) {
+ this->eventHandler_->handlerError(ctx, "Airavata.getDetailedExperimentTree");
+ }
+
+ ::apache::thrift::TApplicationException x(e.what());
+ oprot->writeMessageBegin("getDetailedExperimentTree", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ x.write(oprot);
+ oprot->writeMessageEnd();
+ oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+ return;
+ }
+
+ if (this->eventHandler_.get() != NULL) {
+ this->eventHandler_->preWrite(ctx, "Airavata.getDetailedExperimentTree");
+ }
+
+ oprot->writeMessageBegin("getDetailedExperimentTree", ::apache::thrift::protocol::T_REPLY, seqid);
+ result.write(oprot);
+ oprot->writeMessageEnd();
+ bytes = oprot->getTransport()->writeEnd();
+ oprot->getTransport()->flush();
+
+ if (this->eventHandler_.get() != NULL) {
+ this->eventHandler_->postWrite(ctx, "Airavata.getDetailedExperimentTree", bytes);
+ }
+}
+
void AiravataProcessor::process_updateExperiment(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 21c296c..a7e0531 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
@@ -474,6 +474,45 @@ class AiravataIf {
virtual void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param authzToken
+ * @param airavataExperimentId
+ */
+ virtual void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
+
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -1842,6 +1881,9 @@ class AiravataNull : virtual public AiravataIf {
void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */) {
return;
}
+ void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */) {
+ return;
+ }
void updateExperiment(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */, const ::apache::airavata::model::experiment::ExperimentModel& /* experiment */) {
return;
}
@@ -6130,8 +6172,8 @@ typedef struct _Airavata_getExperimentsInProject_result__isset {
class Airavata_getExperimentsInProject_result {
public:
- static const char* ascii_fingerprint; // = "4A43F862B4395ECBB8FAF5A2B8AD5719";
- static const uint8_t binary_fingerprint[16]; // = {0x4A,0x43,0xF8,0x62,0xB4,0x39,0x5E,0xCB,0xB8,0xFA,0xF5,0xA2,0xB8,0xAD,0x57,0x19};
+ static const char* ascii_fingerprint; // = "B8784F6CD390EB041E2F35FF8F2F5DF8";
+ static const uint8_t binary_fingerprint[16]; // = {0xB8,0x78,0x4F,0x6C,0xD3,0x90,0xEB,0x04,0x1E,0x2F,0x35,0xFF,0x8F,0x2F,0x5D,0xF8};
Airavata_getExperimentsInProject_result(const Airavata_getExperimentsInProject_result&);
Airavata_getExperimentsInProject_result& operator=(const Airavata_getExperimentsInProject_result&);
@@ -6201,8 +6243,8 @@ typedef struct _Airavata_getExperimentsInProject_presult__isset {
class Airavata_getExperimentsInProject_presult {
public:
- static const char* ascii_fingerprint; // = "4A43F862B4395ECBB8FAF5A2B8AD5719";
- static const uint8_t binary_fingerprint[16]; // = {0x4A,0x43,0xF8,0x62,0xB4,0x39,0x5E,0xCB,0xB8,0xFA,0xF5,0xA2,0xB8,0xAD,0x57,0x19};
+ static const char* ascii_fingerprint; // = "B8784F6CD390EB041E2F35FF8F2F5DF8";
+ static const uint8_t binary_fingerprint[16]; // = {0xB8,0x78,0x4F,0x6C,0xD3,0x90,0xEB,0x04,0x1E,0x2F,0x35,0xFF,0x8F,0x2F,0x5D,0xF8};
virtual ~Airavata_getExperimentsInProject_presult() throw();
@@ -6307,8 +6349,8 @@ typedef struct _Airavata_getUserExperiments_result__isset {
class Airavata_getUserExperiments_result {
public:
- static const char* ascii_fingerprint; // = "564D61ED145B7790C97978C1EC67EB22";
- static const uint8_t binary_fingerprint[16]; // = {0x56,0x4D,0x61,0xED,0x14,0x5B,0x77,0x90,0xC9,0x79,0x78,0xC1,0xEC,0x67,0xEB,0x22};
+ static const char* ascii_fingerprint; // = "84E19C1C4E5B827947AAA2E898184043";
+ static const uint8_t binary_fingerprint[16]; // = {0x84,0xE1,0x9C,0x1C,0x4E,0x5B,0x82,0x79,0x47,0xAA,0xA2,0xE8,0x98,0x18,0x40,0x43};
Airavata_getUserExperiments_result(const Airavata_getUserExperiments_result&);
Airavata_getUserExperiments_result& operator=(const Airavata_getUserExperiments_result&);
@@ -6372,8 +6414,8 @@ typedef struct _Airavata_getUserExperiments_presult__isset {
class Airavata_getUserExperiments_presult {
public:
- static const char* ascii_fingerprint; // = "564D61ED145B7790C97978C1EC67EB22";
- static const uint8_t binary_fingerprint[16]; // = {0x56,0x4D,0x61,0xED,0x14,0x5B,0x77,0x90,0xC9,0x79,0x78,0xC1,0xEC,0x67,0xEB,0x22};
+ static const char* ascii_fingerprint; // = "84E19C1C4E5B827947AAA2E898184043";
+ static const uint8_t binary_fingerprint[16]; // = {0x84,0xE1,0x9C,0x1C,0x4E,0x5B,0x82,0x79,0x47,0xAA,0xA2,0xE8,0x98,0x18,0x40,0x43};
virtual ~Airavata_getUserExperiments_presult() throw();
@@ -6394,8 +6436,8 @@ class Airavata_getUserExperiments_presult {
class Airavata_createExperiment_args {
public:
- static const char* ascii_fingerprint; // = "9A4BE74079A0E2FB7F9DE44451A9128E";
- static const uint8_t binary_fingerprint[16]; // = {0x9A,0x4B,0xE7,0x40,0x79,0xA0,0xE2,0xFB,0x7F,0x9D,0xE4,0x44,0x51,0xA9,0x12,0x8E};
+ static const char* ascii_fingerprint; // = "AF8D8506603C5450CFF6943D2A1CC541";
+ static const uint8_t binary_fingerprint[16]; // = {0xAF,0x8D,0x85,0x06,0x60,0x3C,0x54,0x50,0xCF,0xF6,0x94,0x3D,0x2A,0x1C,0xC5,0x41};
Airavata_createExperiment_args(const Airavata_createExperiment_args&);
Airavata_createExperiment_args& operator=(const Airavata_createExperiment_args&);
@@ -6439,8 +6481,8 @@ class Airavata_createExperiment_args {
class Airavata_createExperiment_pargs {
public:
- static const char* ascii_fingerprint; // = "9A4BE74079A0E2FB7F9DE44451A9128E";
- static const uint8_t binary_fingerprint[16]; // = {0x9A,0x4B,0xE7,0x40,0x79,0xA0,0xE2,0xFB,0x7F,0x9D,0xE4,0x44,0x51,0xA9,0x12,0x8E};
+ static const char* ascii_fingerprint; // = "AF8D8506603C5450CFF6943D2A1CC541";
+ static const uint8_t binary_fingerprint[16]; // = {0xAF,0x8D,0x85,0x06,0x60,0x3C,0x54,0x50,0xCF,0xF6,0x94,0x3D,0x2A,0x1C,0xC5,0x41};
virtual ~Airavata_createExperiment_pargs() throw();
@@ -6770,8 +6812,8 @@ typedef struct _Airavata_getExperiment_result__isset {
class Airavata_getExperiment_result {
public:
- static const char* ascii_fingerprint; // = "0AC3160B80BF5C1F1AA64595E360CB5D";
- static const uint8_t binary_fingerprint[16]; // = {0x0A,0xC3,0x16,0x0B,0x80,0xBF,0x5C,0x1F,0x1A,0xA6,0x45,0x95,0xE3,0x60,0xCB,0x5D};
+ static const char* ascii_fingerprint; // = "97507E675D509FA1DF7A743F62A5860C";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0x50,0x7E,0x67,0x5D,0x50,0x9F,0xA1,0xDF,0x7A,0x74,0x3F,0x62,0xA5,0x86,0x0C};
Airavata_getExperiment_result(const Airavata_getExperiment_result&);
Airavata_getExperiment_result& operator=(const Airavata_getExperiment_result&);
@@ -6841,8 +6883,8 @@ typedef struct _Airavata_getExperiment_presult__isset {
class Airavata_getExperiment_presult {
public:
- static const char* ascii_fingerprint; // = "0AC3160B80BF5C1F1AA64595E360CB5D";
- static const uint8_t binary_fingerprint[16]; // = {0x0A,0xC3,0x16,0x0B,0x80,0xBF,0x5C,0x1F,0x1A,0xA6,0x45,0x95,0xE3,0x60,0xCB,0x5D};
+ static const char* ascii_fingerprint; // = "97507E675D509FA1DF7A743F62A5860C";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0x50,0x7E,0x67,0x5D,0x50,0x9F,0xA1,0xDF,0x7A,0x74,0x3F,0x62,0xA5,0x86,0x0C};
virtual ~Airavata_getExperiment_presult() throw();
@@ -6861,11 +6903,171 @@ class Airavata_getExperiment_presult {
};
+class Airavata_getDetailedExperimentTree_args {
+ public:
+
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
+
+ Airavata_getDetailedExperimentTree_args(const Airavata_getDetailedExperimentTree_args&);
+ Airavata_getDetailedExperimentTree_args& operator=(const Airavata_getDetailedExperimentTree_args&);
+ Airavata_getDetailedExperimentTree_args() : airavataExperimentId() {
+ }
+
+ virtual ~Airavata_getDetailedExperimentTree_args() throw();
+ ::apache::airavata::model::security::AuthzToken authzToken;
+ std::string airavataExperimentId;
+
+ void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
+
+ void __set_airavataExperimentId(const std::string& val);
+
+ bool operator == (const Airavata_getDetailedExperimentTree_args & rhs) const
+ {
+ if (!(authzToken == rhs.authzToken))
+ return false;
+ if (!(airavataExperimentId == rhs.airavataExperimentId))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getDetailedExperimentTree_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getDetailedExperimentTree_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getDetailedExperimentTree_args& obj);
+};
+
+
+class Airavata_getDetailedExperimentTree_pargs {
+ public:
+
+ static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
+ static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
+
+
+ virtual ~Airavata_getDetailedExperimentTree_pargs() throw();
+ const ::apache::airavata::model::security::AuthzToken* authzToken;
+ const std::string* airavataExperimentId;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getDetailedExperimentTree_pargs& obj);
+};
+
+typedef struct _Airavata_getDetailedExperimentTree_result__isset {
+ _Airavata_getDetailedExperimentTree_result__isset() : success(false), ire(false), enf(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool enf :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_getDetailedExperimentTree_result__isset;
+
+class Airavata_getDetailedExperimentTree_result {
+ public:
+
+ static const char* ascii_fingerprint; // = "97507E675D509FA1DF7A743F62A5860C";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0x50,0x7E,0x67,0x5D,0x50,0x9F,0xA1,0xDF,0x7A,0x74,0x3F,0x62,0xA5,0x86,0x0C};
+
+ Airavata_getDetailedExperimentTree_result(const Airavata_getDetailedExperimentTree_result&);
+ Airavata_getDetailedExperimentTree_result& operator=(const Airavata_getDetailedExperimentTree_result&);
+ Airavata_getDetailedExperimentTree_result() {
+ }
+
+ virtual ~Airavata_getDetailedExperimentTree_result() throw();
+ ::apache::airavata::model::experiment::ExperimentModel success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::ExperimentNotFoundException enf;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getDetailedExperimentTree_result__isset __isset;
+
+ void __set_success(const ::apache::airavata::model::experiment::ExperimentModel& val);
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
+
+ void __set_enf(const ::apache::airavata::api::error::ExperimentNotFoundException& 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_getDetailedExperimentTree_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(enf == rhs.enf))
+ 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_getDetailedExperimentTree_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getDetailedExperimentTree_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getDetailedExperimentTree_result& obj);
+};
+
+typedef struct _Airavata_getDetailedExperimentTree_presult__isset {
+ _Airavata_getDetailedExperimentTree_presult__isset() : success(false), ire(false), enf(false), ace(false), ase(false), ae(false) {}
+ bool success :1;
+ bool ire :1;
+ bool enf :1;
+ bool ace :1;
+ bool ase :1;
+ bool ae :1;
+} _Airavata_getDetailedExperimentTree_presult__isset;
+
+class Airavata_getDetailedExperimentTree_presult {
+ public:
+
+ static const char* ascii_fingerprint; // = "97507E675D509FA1DF7A743F62A5860C";
+ static const uint8_t binary_fingerprint[16]; // = {0x97,0x50,0x7E,0x67,0x5D,0x50,0x9F,0xA1,0xDF,0x7A,0x74,0x3F,0x62,0xA5,0x86,0x0C};
+
+
+ virtual ~Airavata_getDetailedExperimentTree_presult() throw();
+ ::apache::airavata::model::experiment::ExperimentModel* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::ExperimentNotFoundException enf;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+ ::apache::airavata::api::error::AuthorizationException ae;
+
+ _Airavata_getDetailedExperimentTree_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getDetailedExperimentTree_presult& obj);
+};
+
+
class Airavata_updateExperiment_args {
public:
- static const char* ascii_fingerprint; // = "9A4BE74079A0E2FB7F9DE44451A9128E";
- static const uint8_t binary_fingerprint[16]; // = {0x9A,0x4B,0xE7,0x40,0x79,0xA0,0xE2,0xFB,0x7F,0x9D,0xE4,0x44,0x51,0xA9,0x12,0x8E};
+ static const char* ascii_fingerprint; // = "AF8D8506603C5450CFF6943D2A1CC541";
+ static const uint8_t binary_fingerprint[16]; // = {0xAF,0x8D,0x85,0x06,0x60,0x3C,0x54,0x50,0xCF,0xF6,0x94,0x3D,0x2A,0x1C,0xC5,0x41};
Airavata_updateExperiment_args(const Airavata_updateExperiment_args&);
Airavata_updateExperiment_args& operator=(const Airavata_updateExperiment_args&);
@@ -6909,8 +7111,8 @@ class Airavata_updateExperiment_args {
class Airavata_updateExperiment_pargs {
public:
- static const char* ascii_fingerprint; // = "9A4BE74079A0E2FB7F9DE44451A9128E";
- static const uint8_t binary_fingerprint[16]; // = {0x9A,0x4B,0xE7,0x40,0x79,0xA0,0xE2,0xFB,0x7F,0x9D,0xE4,0x44,0x51,0xA9,0x12,0x8E};
+ static const char* ascii_fingerprint; // = "AF8D8506603C5450CFF6943D2A1CC541";
+ static const uint8_t binary_fingerprint[16]; // = {0xAF,0x8D,0x85,0x06,0x60,0x3C,0x54,0x50,0xCF,0xF6,0x94,0x3D,0x2A,0x1C,0xC5,0x41};
virtual ~Airavata_updateExperiment_pargs() throw();
@@ -21750,6 +21952,9 @@ class AiravataClient : virtual public AiravataIf {
void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
void send_getExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
void recv_getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return);
+ void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
+ void send_getDetailedExperimentTree(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
+ void recv_getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return);
void updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment);
void send_updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment);
void recv_updateExperiment();
@@ -22079,6 +22284,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_createExperiment(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteExperiment(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getExperiment(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getDetailedExperimentTree(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateExperiment(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateExperimentConfiguration(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateResourceScheduleing(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -22206,6 +22412,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["createExperiment"] = &AiravataProcessor::process_createExperiment;
processMap_["deleteExperiment"] = &AiravataProcessor::process_deleteExperiment;
processMap_["getExperiment"] = &AiravataProcessor::process_getExperiment;
+ processMap_["getDetailedExperimentTree"] = &AiravataProcessor::process_getDetailedExperimentTree;
processMap_["updateExperiment"] = &AiravataProcessor::process_updateExperiment;
processMap_["updateExperimentConfiguration"] = &AiravataProcessor::process_updateExperimentConfiguration;
processMap_["updateResourceScheduleing"] = &AiravataProcessor::process_updateResourceScheduleing;
@@ -22613,6 +22820,16 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
+ void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->getDetailedExperimentTree(_return, authzToken, airavataExperimentId);
+ }
+ ifaces_[i]->getDetailedExperimentTree(_return, authzToken, airavataExperimentId);
+ return;
+ }
+
void updateExperiment(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment) {
size_t sz = ifaces_.size();
size_t i = 0;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 d28d236..5b8f2b1 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
@@ -576,6 +576,48 @@ class AiravataHandler : virtual public AiravataIf {
}
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param authzToken
+ * @param airavataExperimentId
+ */
+ void getDetailedExperimentTree( ::apache::airavata::model::experiment::ExperimentModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) {
+ // Your implementation goes here
+ printf("getDetailedExperimentTree\n");
+ }
+
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 d4e5ad2..cdbf72b 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
@@ -370,8 +370,13 @@ void ExperimentModel::__set_errors(const std::vector< ::apache::airavata::model:
__isset.errors = true;
}
-const char* ExperimentModel::ascii_fingerprint = "5B49E16C9D5CBD0AE0EC026061048743";
-const uint8_t ExperimentModel::binary_fingerprint[16] = {0x5B,0x49,0xE1,0x6C,0x9D,0x5C,0xBD,0x0A,0xE0,0xEC,0x02,0x60,0x61,0x04,0x87,0x43};
+void ExperimentModel::__set_processes(const std::vector< ::apache::airavata::model::process::ProcessModel> & val) {
+ this->processes = val;
+__isset.processes = true;
+}
+
+const char* ExperimentModel::ascii_fingerprint = "4DF530DE68212F7F779CF0EF35D9EDC3";
+const uint8_t ExperimentModel::binary_fingerprint[16] = {0x4D,0xF5,0x30,0xDE,0x68,0x21,0x2F,0x7F,0x77,0x9C,0xF0,0xEF,0x35,0xD9,0xED,0xC3};
uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -585,6 +590,26 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
+ case 18:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->processes.clear();
+ uint32_t _size23;
+ ::apache::thrift::protocol::TType _etype26;
+ xfer += iprot->readListBegin(_etype26, _size23);
+ this->processes.resize(_size23);
+ uint32_t _i27;
+ for (_i27 = 0; _i27 < _size23; ++_i27)
+ {
+ xfer += this->processes[_i27].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.processes = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -667,10 +692,10 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldBegin("emailAddresses", ::apache::thrift::protocol::T_LIST, 12);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->emailAddresses.size()));
- std::vector<std::string> ::const_iterator _iter23;
- for (_iter23 = this->emailAddresses.begin(); _iter23 != this->emailAddresses.end(); ++_iter23)
+ std::vector<std::string> ::const_iterator _iter28;
+ for (_iter28 = this->emailAddresses.begin(); _iter28 != this->emailAddresses.end(); ++_iter28)
{
- xfer += oprot->writeString((*_iter23));
+ xfer += oprot->writeString((*_iter28));
}
xfer += oprot->writeListEnd();
}
@@ -685,10 +710,10 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldBegin("experimentInputs", ::apache::thrift::protocol::T_LIST, 14);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->experimentInputs.size()));
- std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter24;
- for (_iter24 = this->experimentInputs.begin(); _iter24 != this->experimentInputs.end(); ++_iter24)
+ std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter29;
+ for (_iter29 = this->experimentInputs.begin(); _iter29 != this->experimentInputs.end(); ++_iter29)
{
- xfer += (*_iter24).write(oprot);
+ xfer += (*_iter29).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -698,10 +723,10 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldBegin("experimentOutputs", ::apache::thrift::protocol::T_LIST, 15);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->experimentOutputs.size()));
- std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter25;
- for (_iter25 = this->experimentOutputs.begin(); _iter25 != this->experimentOutputs.end(); ++_iter25)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter30;
+ for (_iter30 = this->experimentOutputs.begin(); _iter30 != this->experimentOutputs.end(); ++_iter30)
{
- xfer += (*_iter25).write(oprot);
+ xfer += (*_iter30).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -716,10 +741,23 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 17);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->errors.size()));
- std::vector< ::apache::airavata::model::commons::ErrorModel> ::const_iterator _iter26;
- for (_iter26 = this->errors.begin(); _iter26 != this->errors.end(); ++_iter26)
+ std::vector< ::apache::airavata::model::commons::ErrorModel> ::const_iterator _iter31;
+ for (_iter31 = this->errors.begin(); _iter31 != this->errors.end(); ++_iter31)
+ {
+ xfer += (*_iter31).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.processes) {
+ xfer += oprot->writeFieldBegin("processes", ::apache::thrift::protocol::T_LIST, 18);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processes.size()));
+ std::vector< ::apache::airavata::model::process::ProcessModel> ::const_iterator _iter32;
+ for (_iter32 = this->processes.begin(); _iter32 != this->processes.end(); ++_iter32)
{
- xfer += (*_iter26).write(oprot);
+ xfer += (*_iter32).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -750,48 +788,51 @@ void swap(ExperimentModel &a, ExperimentModel &b) {
swap(a.experimentOutputs, b.experimentOutputs);
swap(a.experimentStatus, b.experimentStatus);
swap(a.errors, b.errors);
+ swap(a.processes, b.processes);
swap(a.__isset, b.__isset);
}
-ExperimentModel::ExperimentModel(const ExperimentModel& other27) {
- experimentId = other27.experimentId;
- projectId = other27.projectId;
- gatewayId = other27.gatewayId;
- experimentType = other27.experimentType;
- userName = other27.userName;
- experimentName = other27.experimentName;
- creationTime = other27.creationTime;
- description = other27.description;
- executionId = other27.executionId;
- gatewayExecutionId = other27.gatewayExecutionId;
- enableEmailNotification = other27.enableEmailNotification;
- emailAddresses = other27.emailAddresses;
- userConfigurationData = other27.userConfigurationData;
- experimentInputs = other27.experimentInputs;
- experimentOutputs = other27.experimentOutputs;
- experimentStatus = other27.experimentStatus;
- errors = other27.errors;
- __isset = other27.__isset;
-}
-ExperimentModel& ExperimentModel::operator=(const ExperimentModel& other28) {
- experimentId = other28.experimentId;
- projectId = other28.projectId;
- gatewayId = other28.gatewayId;
- experimentType = other28.experimentType;
- userName = other28.userName;
- experimentName = other28.experimentName;
- creationTime = other28.creationTime;
- description = other28.description;
- executionId = other28.executionId;
- gatewayExecutionId = other28.gatewayExecutionId;
- enableEmailNotification = other28.enableEmailNotification;
- emailAddresses = other28.emailAddresses;
- userConfigurationData = other28.userConfigurationData;
- experimentInputs = other28.experimentInputs;
- experimentOutputs = other28.experimentOutputs;
- experimentStatus = other28.experimentStatus;
- errors = other28.errors;
- __isset = other28.__isset;
+ExperimentModel::ExperimentModel(const ExperimentModel& other33) {
+ experimentId = other33.experimentId;
+ projectId = other33.projectId;
+ gatewayId = other33.gatewayId;
+ experimentType = other33.experimentType;
+ userName = other33.userName;
+ experimentName = other33.experimentName;
+ creationTime = other33.creationTime;
+ description = other33.description;
+ executionId = other33.executionId;
+ gatewayExecutionId = other33.gatewayExecutionId;
+ enableEmailNotification = other33.enableEmailNotification;
+ emailAddresses = other33.emailAddresses;
+ userConfigurationData = other33.userConfigurationData;
+ experimentInputs = other33.experimentInputs;
+ experimentOutputs = other33.experimentOutputs;
+ experimentStatus = other33.experimentStatus;
+ errors = other33.errors;
+ processes = other33.processes;
+ __isset = other33.__isset;
+}
+ExperimentModel& ExperimentModel::operator=(const ExperimentModel& other34) {
+ experimentId = other34.experimentId;
+ projectId = other34.projectId;
+ gatewayId = other34.gatewayId;
+ experimentType = other34.experimentType;
+ userName = other34.userName;
+ experimentName = other34.experimentName;
+ creationTime = other34.creationTime;
+ description = other34.description;
+ executionId = other34.executionId;
+ gatewayExecutionId = other34.gatewayExecutionId;
+ enableEmailNotification = other34.enableEmailNotification;
+ emailAddresses = other34.emailAddresses;
+ userConfigurationData = other34.userConfigurationData;
+ experimentInputs = other34.experimentInputs;
+ experimentOutputs = other34.experimentOutputs;
+ experimentStatus = other34.experimentStatus;
+ errors = other34.errors;
+ processes = other34.processes;
+ __isset = other34.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const ExperimentModel& obj) {
@@ -814,6 +855,7 @@ std::ostream& operator<<(std::ostream& out, const ExperimentModel& obj) {
out << ", " << "experimentOutputs="; (obj.__isset.experimentOutputs ? (out << to_string(obj.experimentOutputs)) : (out << "<null>"));
out << ", " << "experimentStatus="; (obj.__isset.experimentStatus ? (out << to_string(obj.experimentStatus)) : (out << "<null>"));
out << ", " << "errors="; (obj.__isset.errors ? (out << to_string(obj.errors)) : (out << "<null>"));
+ out << ", " << "processes="; (obj.__isset.processes ? (out << to_string(obj.processes)) : (out << "<null>"));
out << ")";
return out;
}
@@ -1088,33 +1130,33 @@ void swap(ExperimentSummaryModel &a, ExperimentSummaryModel &b) {
swap(a.__isset, b.__isset);
}
-ExperimentSummaryModel::ExperimentSummaryModel(const ExperimentSummaryModel& other29) {
- experimentId = other29.experimentId;
- projectId = other29.projectId;
- gatewayId = other29.gatewayId;
- creationTime = other29.creationTime;
- userName = other29.userName;
- name = other29.name;
- description = other29.description;
- executionId = other29.executionId;
- resourceHostId = other29.resourceHostId;
- experimentStatus = other29.experimentStatus;
- statusUpdateTime = other29.statusUpdateTime;
- __isset = other29.__isset;
-}
-ExperimentSummaryModel& ExperimentSummaryModel::operator=(const ExperimentSummaryModel& other30) {
- experimentId = other30.experimentId;
- projectId = other30.projectId;
- gatewayId = other30.gatewayId;
- creationTime = other30.creationTime;
- userName = other30.userName;
- name = other30.name;
- description = other30.description;
- executionId = other30.executionId;
- resourceHostId = other30.resourceHostId;
- experimentStatus = other30.experimentStatus;
- statusUpdateTime = other30.statusUpdateTime;
- __isset = other30.__isset;
+ExperimentSummaryModel::ExperimentSummaryModel(const ExperimentSummaryModel& other35) {
+ experimentId = other35.experimentId;
+ projectId = other35.projectId;
+ gatewayId = other35.gatewayId;
+ creationTime = other35.creationTime;
+ userName = other35.userName;
+ name = other35.name;
+ description = other35.description;
+ executionId = other35.executionId;
+ resourceHostId = other35.resourceHostId;
+ experimentStatus = other35.experimentStatus;
+ statusUpdateTime = other35.statusUpdateTime;
+ __isset = other35.__isset;
+}
+ExperimentSummaryModel& ExperimentSummaryModel::operator=(const ExperimentSummaryModel& other36) {
+ experimentId = other36.experimentId;
+ projectId = other36.projectId;
+ gatewayId = other36.gatewayId;
+ creationTime = other36.creationTime;
+ userName = other36.userName;
+ name = other36.name;
+ description = other36.description;
+ executionId = other36.executionId;
+ resourceHostId = other36.resourceHostId;
+ experimentStatus = other36.experimentStatus;
+ statusUpdateTime = other36.statusUpdateTime;
+ __isset = other36.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const ExperimentSummaryModel& obj) {
@@ -1275,14 +1317,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->allExperiments.clear();
- uint32_t _size31;
- ::apache::thrift::protocol::TType _etype34;
- xfer += iprot->readListBegin(_etype34, _size31);
- this->allExperiments.resize(_size31);
- uint32_t _i35;
- for (_i35 = 0; _i35 < _size31; ++_i35)
+ uint32_t _size37;
+ ::apache::thrift::protocol::TType _etype40;
+ xfer += iprot->readListBegin(_etype40, _size37);
+ this->allExperiments.resize(_size37);
+ uint32_t _i41;
+ for (_i41 = 0; _i41 < _size37; ++_i41)
{
- xfer += this->allExperiments[_i35].read(iprot);
+ xfer += this->allExperiments[_i41].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1295,14 +1337,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->completedExperiments.clear();
- uint32_t _size36;
- ::apache::thrift::protocol::TType _etype39;
- xfer += iprot->readListBegin(_etype39, _size36);
- this->completedExperiments.resize(_size36);
- uint32_t _i40;
- for (_i40 = 0; _i40 < _size36; ++_i40)
+ uint32_t _size42;
+ ::apache::thrift::protocol::TType _etype45;
+ xfer += iprot->readListBegin(_etype45, _size42);
+ this->completedExperiments.resize(_size42);
+ uint32_t _i46;
+ for (_i46 = 0; _i46 < _size42; ++_i46)
{
- xfer += this->completedExperiments[_i40].read(iprot);
+ xfer += this->completedExperiments[_i46].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1315,14 +1357,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->failedExperiments.clear();
- uint32_t _size41;
- ::apache::thrift::protocol::TType _etype44;
- xfer += iprot->readListBegin(_etype44, _size41);
- this->failedExperiments.resize(_size41);
- uint32_t _i45;
- for (_i45 = 0; _i45 < _size41; ++_i45)
+ uint32_t _size47;
+ ::apache::thrift::protocol::TType _etype50;
+ xfer += iprot->readListBegin(_etype50, _size47);
+ this->failedExperiments.resize(_size47);
+ uint32_t _i51;
+ for (_i51 = 0; _i51 < _size47; ++_i51)
{
- xfer += this->failedExperiments[_i45].read(iprot);
+ xfer += this->failedExperiments[_i51].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1335,14 +1377,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->cancelledExperiments.clear();
- uint32_t _size46;
- ::apache::thrift::protocol::TType _etype49;
- xfer += iprot->readListBegin(_etype49, _size46);
- this->cancelledExperiments.resize(_size46);
- uint32_t _i50;
- for (_i50 = 0; _i50 < _size46; ++_i50)
+ uint32_t _size52;
+ ::apache::thrift::protocol::TType _etype55;
+ xfer += iprot->readListBegin(_etype55, _size52);
+ this->cancelledExperiments.resize(_size52);
+ uint32_t _i56;
+ for (_i56 = 0; _i56 < _size52; ++_i56)
{
- xfer += this->cancelledExperiments[_i50].read(iprot);
+ xfer += this->cancelledExperiments[_i56].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1355,14 +1397,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->createdExperiments.clear();
- uint32_t _size51;
- ::apache::thrift::protocol::TType _etype54;
- xfer += iprot->readListBegin(_etype54, _size51);
- this->createdExperiments.resize(_size51);
- uint32_t _i55;
- for (_i55 = 0; _i55 < _size51; ++_i55)
+ uint32_t _size57;
+ ::apache::thrift::protocol::TType _etype60;
+ xfer += iprot->readListBegin(_etype60, _size57);
+ this->createdExperiments.resize(_size57);
+ uint32_t _i61;
+ for (_i61 = 0; _i61 < _size57; ++_i61)
{
- xfer += this->createdExperiments[_i55].read(iprot);
+ xfer += this->createdExperiments[_i61].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1375,14 +1417,14 @@ uint32_t ExperimentStatistics::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->runningExperiments.clear();
- uint32_t _size56;
- ::apache::thrift::protocol::TType _etype59;
- xfer += iprot->readListBegin(_etype59, _size56);
- this->runningExperiments.resize(_size56);
- uint32_t _i60;
- for (_i60 = 0; _i60 < _size56; ++_i60)
+ uint32_t _size62;
+ ::apache::thrift::protocol::TType _etype65;
+ xfer += iprot->readListBegin(_etype65, _size62);
+ this->runningExperiments.resize(_size62);
+ uint32_t _i66;
+ for (_i66 = 0; _i66 < _size62; ++_i66)
{
- xfer += this->runningExperiments[_i60].read(iprot);
+ xfer += this->runningExperiments[_i66].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1448,10 +1490,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("allExperiments", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->allExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter61;
- for (_iter61 = this->allExperiments.begin(); _iter61 != this->allExperiments.end(); ++_iter61)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter67;
+ for (_iter67 = this->allExperiments.begin(); _iter67 != this->allExperiments.end(); ++_iter67)
{
- xfer += (*_iter61).write(oprot);
+ xfer += (*_iter67).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1461,10 +1503,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("completedExperiments", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->completedExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter62;
- for (_iter62 = this->completedExperiments.begin(); _iter62 != this->completedExperiments.end(); ++_iter62)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter68;
+ for (_iter68 = this->completedExperiments.begin(); _iter68 != this->completedExperiments.end(); ++_iter68)
{
- xfer += (*_iter62).write(oprot);
+ xfer += (*_iter68).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1474,10 +1516,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("failedExperiments", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->failedExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter63;
- for (_iter63 = this->failedExperiments.begin(); _iter63 != this->failedExperiments.end(); ++_iter63)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter69;
+ for (_iter69 = this->failedExperiments.begin(); _iter69 != this->failedExperiments.end(); ++_iter69)
{
- xfer += (*_iter63).write(oprot);
+ xfer += (*_iter69).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1487,10 +1529,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("cancelledExperiments", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->cancelledExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter64;
- for (_iter64 = this->cancelledExperiments.begin(); _iter64 != this->cancelledExperiments.end(); ++_iter64)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter70;
+ for (_iter70 = this->cancelledExperiments.begin(); _iter70 != this->cancelledExperiments.end(); ++_iter70)
{
- xfer += (*_iter64).write(oprot);
+ xfer += (*_iter70).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1500,10 +1542,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("createdExperiments", ::apache::thrift::protocol::T_LIST, 11);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->createdExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter65;
- for (_iter65 = this->createdExperiments.begin(); _iter65 != this->createdExperiments.end(); ++_iter65)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter71;
+ for (_iter71 = this->createdExperiments.begin(); _iter71 != this->createdExperiments.end(); ++_iter71)
{
- xfer += (*_iter65).write(oprot);
+ xfer += (*_iter71).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1513,10 +1555,10 @@ uint32_t ExperimentStatistics::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("runningExperiments", ::apache::thrift::protocol::T_LIST, 12);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->runningExperiments.size()));
- std::vector<ExperimentSummaryModel> ::const_iterator _iter66;
- for (_iter66 = this->runningExperiments.begin(); _iter66 != this->runningExperiments.end(); ++_iter66)
+ std::vector<ExperimentSummaryModel> ::const_iterator _iter72;
+ for (_iter72 = this->runningExperiments.begin(); _iter72 != this->runningExperiments.end(); ++_iter72)
{
- xfer += (*_iter66).write(oprot);
+ xfer += (*_iter72).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1545,35 +1587,35 @@ void swap(ExperimentStatistics &a, ExperimentStatistics &b) {
swap(a.__isset, b.__isset);
}
-ExperimentStatistics::ExperimentStatistics(const ExperimentStatistics& other67) {
- allExperimentCount = other67.allExperimentCount;
- completedExperimentCount = other67.completedExperimentCount;
- cancelledExperimentCount = other67.cancelledExperimentCount;
- failedExperimentCount = other67.failedExperimentCount;
- createdExperimentCount = other67.createdExperimentCount;
- runningExperimentCount = other67.runningExperimentCount;
- allExperiments = other67.allExperiments;
- completedExperiments = other67.completedExperiments;
- failedExperiments = other67.failedExperiments;
- cancelledExperiments = other67.cancelledExperiments;
- createdExperiments = other67.createdExperiments;
- runningExperiments = other67.runningExperiments;
- __isset = other67.__isset;
-}
-ExperimentStatistics& ExperimentStatistics::operator=(const ExperimentStatistics& other68) {
- allExperimentCount = other68.allExperimentCount;
- completedExperimentCount = other68.completedExperimentCount;
- cancelledExperimentCount = other68.cancelledExperimentCount;
- failedExperimentCount = other68.failedExperimentCount;
- createdExperimentCount = other68.createdExperimentCount;
- runningExperimentCount = other68.runningExperimentCount;
- allExperiments = other68.allExperiments;
- completedExperiments = other68.completedExperiments;
- failedExperiments = other68.failedExperiments;
- cancelledExperiments = other68.cancelledExperiments;
- createdExperiments = other68.createdExperiments;
- runningExperiments = other68.runningExperiments;
- __isset = other68.__isset;
+ExperimentStatistics::ExperimentStatistics(const ExperimentStatistics& other73) {
+ allExperimentCount = other73.allExperimentCount;
+ completedExperimentCount = other73.completedExperimentCount;
+ cancelledExperimentCount = other73.cancelledExperimentCount;
+ failedExperimentCount = other73.failedExperimentCount;
+ createdExperimentCount = other73.createdExperimentCount;
+ runningExperimentCount = other73.runningExperimentCount;
+ allExperiments = other73.allExperiments;
+ completedExperiments = other73.completedExperiments;
+ failedExperiments = other73.failedExperiments;
+ cancelledExperiments = other73.cancelledExperiments;
+ createdExperiments = other73.createdExperiments;
+ runningExperiments = other73.runningExperiments;
+ __isset = other73.__isset;
+}
+ExperimentStatistics& ExperimentStatistics::operator=(const ExperimentStatistics& other74) {
+ allExperimentCount = other74.allExperimentCount;
+ completedExperimentCount = other74.completedExperimentCount;
+ cancelledExperimentCount = other74.cancelledExperimentCount;
+ failedExperimentCount = other74.failedExperimentCount;
+ createdExperimentCount = other74.createdExperimentCount;
+ runningExperimentCount = other74.runningExperimentCount;
+ allExperiments = other74.allExperiments;
+ completedExperiments = other74.completedExperiments;
+ failedExperiments = other74.failedExperiments;
+ cancelledExperiments = other74.cancelledExperiments;
+ createdExperiments = other74.createdExperiments;
+ runningExperiments = other74.runningExperiments;
+ __isset = other74.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const ExperimentStatistics& obj) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 13ec7a6..c9f71a2 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
@@ -36,6 +36,7 @@
#include "scheduling_model_types.h"
#include "airavata_commons_types.h"
#include "status_models_types.h"
+#include "process_model_types.h"
namespace apache { namespace airavata { namespace model { namespace experiment {
@@ -159,7 +160,7 @@ class UserConfigurationDataModel {
void swap(UserConfigurationDataModel &a, UserConfigurationDataModel &b);
typedef struct _ExperimentModel__isset {
- _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false) {}
+ _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false), processes(false) {}
bool creationTime :1;
bool description :1;
bool executionId :1;
@@ -171,13 +172,14 @@ typedef struct _ExperimentModel__isset {
bool experimentOutputs :1;
bool experimentStatus :1;
bool errors :1;
+ bool processes :1;
} _ExperimentModel__isset;
class ExperimentModel {
public:
- static const char* ascii_fingerprint; // = "5B49E16C9D5CBD0AE0EC026061048743";
- static const uint8_t binary_fingerprint[16]; // = {0x5B,0x49,0xE1,0x6C,0x9D,0x5C,0xBD,0x0A,0xE0,0xEC,0x02,0x60,0x61,0x04,0x87,0x43};
+ static const char* ascii_fingerprint; // = "4DF530DE68212F7F779CF0EF35D9EDC3";
+ static const uint8_t binary_fingerprint[16]; // = {0x4D,0xF5,0x30,0xDE,0x68,0x21,0x2F,0x7F,0x77,0x9C,0xF0,0xEF,0x35,0xD9,0xED,0xC3};
ExperimentModel(const ExperimentModel&);
ExperimentModel& operator=(const ExperimentModel&);
@@ -204,6 +206,7 @@ class ExperimentModel {
std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> experimentOutputs;
::apache::airavata::model::status::ExperimentStatus experimentStatus;
std::vector< ::apache::airavata::model::commons::ErrorModel> errors;
+ std::vector< ::apache::airavata::model::process::ProcessModel> processes;
_ExperimentModel__isset __isset;
@@ -241,6 +244,8 @@ class ExperimentModel {
void __set_errors(const std::vector< ::apache::airavata::model::commons::ErrorModel> & val);
+ void __set_processes(const std::vector< ::apache::airavata::model::process::ProcessModel> & val);
+
bool operator == (const ExperimentModel & rhs) const
{
if (!(experimentId == rhs.experimentId))
@@ -299,6 +304,10 @@ class ExperimentModel {
return false;
else if (__isset.errors && !(errors == rhs.errors))
return false;
+ if (__isset.processes != rhs.__isset.processes)
+ return false;
+ else if (__isset.processes && !(processes == rhs.processes))
+ return false;
return true;
}
bool operator != (const ExperimentModel &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
index 1bb4dba..12a5cc9 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
@@ -123,8 +123,8 @@ void ProcessModel::__set_emailAddresses(const std::vector<std::string> & val) {
__isset.emailAddresses = true;
}
-const char* ProcessModel::ascii_fingerprint = "39636B349F7E4431980EEC63BDFCEB41";
-const uint8_t ProcessModel::binary_fingerprint[16] = {0x39,0x63,0x6B,0x34,0x9F,0x7E,0x44,0x31,0x98,0x0E,0xEC,0x63,0xBD,0xFC,0xEB,0x41};
+const char* ProcessModel::ascii_fingerprint = "DD9F28E8C54528EC5BBC117D76D7BC84";
+const uint8_t ProcessModel::binary_fingerprint[16] = {0xDD,0x9F,0x28,0xE8,0xC5,0x45,0x28,0xEC,0x5B,0xBC,0x11,0x7D,0x76,0xD7,0xBC,0x84};
uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
index 0d56652..8234941 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
@@ -66,8 +66,8 @@ typedef struct _ProcessModel__isset {
class ProcessModel {
public:
- static const char* ascii_fingerprint; // = "39636B349F7E4431980EEC63BDFCEB41";
- static const uint8_t binary_fingerprint[16]; // = {0x39,0x63,0x6B,0x34,0x9F,0x7E,0x44,0x31,0x98,0x0E,0xEC,0x63,0xBD,0xFC,0xEB,0x41};
+ static const char* ascii_fingerprint; // = "DD9F28E8C54528EC5BBC117D76D7BC84";
+ static const uint8_t binary_fingerprint[16]; // = {0xDD,0x9F,0x28,0xE8,0xC5,0x45,0x28,0xEC,0x5B,0xBC,0x11,0x7D,0x76,0xD7,0xBC,0x84};
ProcessModel(const ProcessModel&);
ProcessModel& operator=(const ProcessModel&);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
index d99d610..02c0936 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
@@ -100,8 +100,13 @@ void TaskModel::__set_taskError(const ::apache::airavata::model::commons::Error
__isset.taskError = true;
}
-const char* TaskModel::ascii_fingerprint = "CE3A1BEFC350140F2B4D2EF1424A7C4F";
-const uint8_t TaskModel::binary_fingerprint[16] = {0xCE,0x3A,0x1B,0xEF,0xC3,0x50,0x14,0x0F,0x2B,0x4D,0x2E,0xF1,0x42,0x4A,0x7C,0x4F};
+void TaskModel::__set_jobs(const std::vector< ::apache::airavata::model::job::JobModel> & val) {
+ this->jobs = val;
+__isset.jobs = true;
+}
+
+const char* TaskModel::ascii_fingerprint = "BA52131C9C867CBF7281F29EDD7DDB6F";
+const uint8_t TaskModel::binary_fingerprint[16] = {0xBA,0x52,0x13,0x1C,0x9C,0x86,0x7C,0xBF,0x72,0x81,0xF2,0x9E,0xDD,0x7D,0xDB,0x6F};
uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -203,6 +208,26 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
+ case 10:
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->jobs.clear();
+ uint32_t _size1;
+ ::apache::thrift::protocol::TType _etype4;
+ xfer += iprot->readListBegin(_etype4, _size1);
+ this->jobs.resize(_size1);
+ uint32_t _i5;
+ for (_i5 = 0; _i5 < _size1; ++_i5)
+ {
+ xfer += this->jobs[_i5].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
+ this->__isset.jobs = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -271,6 +296,19 @@ uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += this->taskError.write(oprot);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.jobs) {
+ xfer += oprot->writeFieldBegin("jobs", ::apache::thrift::protocol::T_LIST, 10);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobs.size()));
+ std::vector< ::apache::airavata::model::job::JobModel> ::const_iterator _iter6;
+ for (_iter6 = this->jobs.begin(); _iter6 != this->jobs.end(); ++_iter6)
+ {
+ xfer += (*_iter6).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
oprot->decrementRecursionDepth();
@@ -288,32 +326,35 @@ void swap(TaskModel &a, TaskModel &b) {
swap(a.taskDetail, b.taskDetail);
swap(a.subTaskModel, b.subTaskModel);
swap(a.taskError, b.taskError);
+ swap(a.jobs, b.jobs);
swap(a.__isset, b.__isset);
}
-TaskModel::TaskModel(const TaskModel& other1) {
- taskId = other1.taskId;
- taskType = other1.taskType;
- parentProcessId = other1.parentProcessId;
- creationTime = other1.creationTime;
- lastUpdateTime = other1.lastUpdateTime;
- taskStatus = other1.taskStatus;
- taskDetail = other1.taskDetail;
- subTaskModel = other1.subTaskModel;
- taskError = other1.taskError;
- __isset = other1.__isset;
-}
-TaskModel& TaskModel::operator=(const TaskModel& other2) {
- taskId = other2.taskId;
- taskType = other2.taskType;
- parentProcessId = other2.parentProcessId;
- creationTime = other2.creationTime;
- lastUpdateTime = other2.lastUpdateTime;
- taskStatus = other2.taskStatus;
- taskDetail = other2.taskDetail;
- subTaskModel = other2.subTaskModel;
- taskError = other2.taskError;
- __isset = other2.__isset;
+TaskModel::TaskModel(const TaskModel& other7) {
+ taskId = other7.taskId;
+ taskType = other7.taskType;
+ parentProcessId = other7.parentProcessId;
+ creationTime = other7.creationTime;
+ lastUpdateTime = other7.lastUpdateTime;
+ taskStatus = other7.taskStatus;
+ taskDetail = other7.taskDetail;
+ subTaskModel = other7.subTaskModel;
+ taskError = other7.taskError;
+ jobs = other7.jobs;
+ __isset = other7.__isset;
+}
+TaskModel& TaskModel::operator=(const TaskModel& other8) {
+ taskId = other8.taskId;
+ taskType = other8.taskType;
+ parentProcessId = other8.parentProcessId;
+ creationTime = other8.creationTime;
+ lastUpdateTime = other8.lastUpdateTime;
+ taskStatus = other8.taskStatus;
+ taskDetail = other8.taskDetail;
+ subTaskModel = other8.subTaskModel;
+ taskError = other8.taskError;
+ jobs = other8.jobs;
+ __isset = other8.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const TaskModel& obj) {
@@ -328,6 +369,7 @@ std::ostream& operator<<(std::ostream& out, const TaskModel& obj) {
out << ", " << "taskDetail="; (obj.__isset.taskDetail ? (out << to_string(obj.taskDetail)) : (out << "<null>"));
out << ", " << "subTaskModel="; (obj.__isset.subTaskModel ? (out << to_string(obj.subTaskModel)) : (out << "<null>"));
out << ", " << "taskError="; (obj.__isset.taskError ? (out << to_string(obj.taskError)) : (out << "<null>"));
+ out << ", " << "jobs="; (obj.__isset.jobs ? (out << to_string(obj.jobs)) : (out << "<null>"));
out << ")";
return out;
}
@@ -418,9 +460,9 @@ uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast3;
- xfer += iprot->readI32(ecast3);
- this->type = (DataStageType::type)ecast3;
+ int32_t ecast9;
+ xfer += iprot->readI32(ecast9);
+ this->type = (DataStageType::type)ecast9;
isset_type = true;
} else {
xfer += iprot->skip(ftype);
@@ -545,27 +587,27 @@ void swap(DataStagingTaskModel &a, DataStagingTaskModel &b) {
swap(a.__isset, b.__isset);
}
-DataStagingTaskModel::DataStagingTaskModel(const DataStagingTaskModel& other4) {
- source = other4.source;
- destination = other4.destination;
- type = other4.type;
- transferStartTime = other4.transferStartTime;
- transferEndTime = other4.transferEndTime;
- transferRate = other4.transferRate;
- processInput = other4.processInput;
- processOutput = other4.processOutput;
- __isset = other4.__isset;
-}
-DataStagingTaskModel& DataStagingTaskModel::operator=(const DataStagingTaskModel& other5) {
- source = other5.source;
- destination = other5.destination;
- type = other5.type;
- transferStartTime = other5.transferStartTime;
- transferEndTime = other5.transferEndTime;
- transferRate = other5.transferRate;
- processInput = other5.processInput;
- processOutput = other5.processOutput;
- __isset = other5.__isset;
+DataStagingTaskModel::DataStagingTaskModel(const DataStagingTaskModel& other10) {
+ source = other10.source;
+ destination = other10.destination;
+ type = other10.type;
+ transferStartTime = other10.transferStartTime;
+ transferEndTime = other10.transferEndTime;
+ transferRate = other10.transferRate;
+ processInput = other10.processInput;
+ processOutput = other10.processOutput;
+ __isset = other10.__isset;
+}
+DataStagingTaskModel& DataStagingTaskModel::operator=(const DataStagingTaskModel& other11) {
+ source = other11.source;
+ destination = other11.destination;
+ type = other11.type;
+ transferStartTime = other11.transferStartTime;
+ transferEndTime = other11.transferEndTime;
+ transferRate = other11.transferRate;
+ processInput = other11.processInput;
+ processOutput = other11.processOutput;
+ __isset = other11.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const DataStagingTaskModel& obj) {
@@ -631,9 +673,9 @@ uint32_t EnvironmentSetupTaskModel::read(::apache::thrift::protocol::TProtocol*
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast6;
- xfer += iprot->readI32(ecast6);
- this->protocol = ( ::apache::airavata::model::appcatalog::computeresource::SecurityProtocol::type)ecast6;
+ int32_t ecast12;
+ xfer += iprot->readI32(ecast12);
+ this->protocol = ( ::apache::airavata::model::appcatalog::computeresource::SecurityProtocol::type)ecast12;
isset_protocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -680,13 +722,13 @@ void swap(EnvironmentSetupTaskModel &a, EnvironmentSetupTaskModel &b) {
swap(a.protocol, b.protocol);
}
-EnvironmentSetupTaskModel::EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel& other7) {
- location = other7.location;
- protocol = other7.protocol;
+EnvironmentSetupTaskModel::EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel& other13) {
+ location = other13.location;
+ protocol = other13.protocol;
}
-EnvironmentSetupTaskModel& EnvironmentSetupTaskModel::operator=(const EnvironmentSetupTaskModel& other8) {
- location = other8.location;
- protocol = other8.protocol;
+EnvironmentSetupTaskModel& EnvironmentSetupTaskModel::operator=(const EnvironmentSetupTaskModel& other14) {
+ location = other14.location;
+ protocol = other14.protocol;
return *this;
}
std::ostream& operator<<(std::ostream& out, const EnvironmentSetupTaskModel& obj) {
@@ -743,9 +785,9 @@ uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* ipr
{
case 1:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast9;
- xfer += iprot->readI32(ecast9);
- this->jobSubmissionProtocol = ( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)ecast9;
+ int32_t ecast15;
+ xfer += iprot->readI32(ecast15);
+ this->jobSubmissionProtocol = ( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)ecast15;
isset_jobSubmissionProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -753,9 +795,9 @@ uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast10;
- xfer += iprot->readI32(ecast10);
- this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast10;
+ int32_t ecast16;
+ xfer += iprot->readI32(ecast16);
+ this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast16;
isset_monitorMode = true;
} else {
xfer += iprot->skip(ftype);
@@ -817,17 +859,17 @@ void swap(JobSubmissionTaskModel &a, JobSubmissionTaskModel &b) {
swap(a.__isset, b.__isset);
}
-JobSubmissionTaskModel::JobSubmissionTaskModel(const JobSubmissionTaskModel& other11) {
- jobSubmissionProtocol = other11.jobSubmissionProtocol;
- monitorMode = other11.monitorMode;
- wallTime = other11.wallTime;
- __isset = other11.__isset;
+JobSubmissionTaskModel::JobSubmissionTaskModel(const JobSubmissionTaskModel& other17) {
+ jobSubmissionProtocol = other17.jobSubmissionProtocol;
+ monitorMode = other17.monitorMode;
+ wallTime = other17.wallTime;
+ __isset = other17.__isset;
}
-JobSubmissionTaskModel& JobSubmissionTaskModel::operator=(const JobSubmissionTaskModel& other12) {
- jobSubmissionProtocol = other12.jobSubmissionProtocol;
- monitorMode = other12.monitorMode;
- wallTime = other12.wallTime;
- __isset = other12.__isset;
+JobSubmissionTaskModel& JobSubmissionTaskModel::operator=(const JobSubmissionTaskModel& other18) {
+ jobSubmissionProtocol = other18.jobSubmissionProtocol;
+ monitorMode = other18.monitorMode;
+ wallTime = other18.wallTime;
+ __isset = other18.__isset;
return *this;
}
std::ostream& operator<<(std::ostream& out, const JobSubmissionTaskModel& obj) {
@@ -875,9 +917,9 @@ uint32_t MonitorTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast13;
- xfer += iprot->readI32(ecast13);
- this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast13;
+ int32_t ecast19;
+ xfer += iprot->readI32(ecast19);
+ this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast19;
isset_monitorMode = true;
} else {
xfer += iprot->skip(ftype);
@@ -917,11 +959,11 @@ void swap(MonitorTaskModel &a, MonitorTaskModel &b) {
swap(a.monitorMode, b.monitorMode);
}
-MonitorTaskModel::MonitorTaskModel(const MonitorTaskModel& other14) {
- monitorMode = other14.monitorMode;
+MonitorTaskModel::MonitorTaskModel(const MonitorTaskModel& other20) {
+ monitorMode = other20.monitorMode;
}
-MonitorTaskModel& MonitorTaskModel::operator=(const MonitorTaskModel& other15) {
- monitorMode = other15.monitorMode;
+MonitorTaskModel& MonitorTaskModel::operator=(const MonitorTaskModel& other21) {
+ monitorMode = other21.monitorMode;
return *this;
}
std::ostream& operator<<(std::ostream& out, const MonitorTaskModel& obj) {
[6/6] airavata git commit: adding getDetailedExperimentTree method
Posted by sc...@apache.org.
adding getDetailedExperimentTree method
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ee330724
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ee330724
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ee330724
Branch: refs/heads/master
Commit: ee330724ff94bc6d2e197729637c5535af8081e7
Parents: dd32d06
Author: scnakandala <su...@gmail.com>
Authored: Mon Nov 16 11:36:46 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Nov 16 11:38:27 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 68 +-
.../java/org/apache/airavata/api/Airavata.java | 10779 ++++++++++-------
.../main/resources/lib/airavata/Airavata.cpp | 451 +
.../src/main/resources/lib/airavata/Airavata.h | 257 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 42 +
.../lib/airavata/experiment_model_types.cpp | 380 +-
.../lib/airavata/experiment_model_types.h | 15 +-
.../lib/airavata/process_model_types.cpp | 4 +-
.../lib/airavata/process_model_types.h | 4 +-
.../resources/lib/airavata/task_model_types.cpp | 204 +-
.../resources/lib/airavata/task_model_types.h | 15 +-
.../resources/lib/Airavata/API/Airavata.php | 433 +
.../lib/Airavata/Model/Experiment/Types.php | 187 +-
.../resources/lib/Airavata/Model/Task/Types.php | 51 +
.../lib/apache/airavata/api/Airavata-remote | 7 +
.../lib/apache/airavata/api/Airavata.py | 358 +
.../apache/airavata/model/experiment/ttypes.py | 125 +-
.../lib/apache/airavata/model/task/ttypes.py | 25 +-
.../org/apache/airavata/model/Workflow.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/DataMovementInterface.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/GridFTPDataMovement.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreDataMovement.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/DataStoragePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 256 +-
.../model/experiment/ExperimentStatistics.java | 218 +-
.../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 | 170 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../airavata-api/airavata_api.thrift | 44 +
.../airavata-api/experiment_model.thrift | 4 +-
.../airavata-api/task_model.thrift | 4 +-
95 files changed, 9008 insertions(+), 5235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 9f0e7cc..e88d4f8 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,10 +74,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);
@@ -1255,6 +1252,69 @@ public class AiravataServerHandler implements Airavata.Iface {
return getExperimentInternal(airavataExperimentId);
}
+ /**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId The identifier for the requested experiment. This is returned during the create experiment step.
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ * @throws org.apache.airavata.model.error.InvalidRequestException For any incorrect forming of the request itself.
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ * @throws org.apache.airavata.model.error.AiravataClientException The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ * <p/>
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ * <p/>
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ * <p/>
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ * @throws org.apache.airavata.model.error.AiravataSystemException This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ */
+ @Override
+ @SecurityCheck
+ public ExperimentModel getDetailedExperimentTree(AuthzToken authzToken, String airavataExperimentId) throws InvalidRequestException,
+ ExperimentNotFoundException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ try {
+ ExperimentModel experimentModel = getExperimentInternal(airavataExperimentId);
+ experimentCatalog = RegistryFactory.getDefaultExpCatalog();
+ List<Object> processObjects = experimentCatalog.get(ExperimentCatalogModelType.PROCESS,
+ Constants.FieldConstants.ExperimentConstants.EXPERIMENT_ID, experimentModel.getExperimentId());
+ List<ProcessModel> processList = new ArrayList<>();
+ if(processObjects != null){
+ processObjects.stream().forEach(p -> {
+ //Process already has the task object
+ ((ProcessModel)p).getTasks().stream().forEach(t->{
+ try {
+ List<Object> jobObjects = experimentCatalog.get(ExperimentCatalogModelType.JOB,
+ Constants.FieldConstants.JobConstants.TASK_ID, ((TaskModel)t).getTaskId());
+ List<JobModel> jobList = new ArrayList<JobModel>();
+ if(jobObjects != null){
+ jobObjects.stream().forEach(j -> jobList.add((JobModel)j));
+ t.setJobs(jobList);
+ }
+ } catch (RegistryException e) {
+ logger.error(e.getMessage(), e);
+ }
+ });
+ processList.add((ProcessModel)p);
+ });
+ experimentModel.setProcesses(processList);
+ }
+ return experimentModel;
+ } catch (Exception e) {
+ logger.error("Error while retrieving the experiment", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while retrieving the experiment. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
/*This private method wraps the logic of getExperiment method as this method is called internally in the API.*/
private ExperimentModel getExperimentInternal(String airavataExperimentId) throws InvalidRequestException,
ExperimentNotFoundException, AiravataClientException, AiravataSystemException, TException {
[2/6] airavata git commit: adding getDetailedExperimentTree method
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 4a5be73..37fc3fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
index 832da4b..aea033f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 aaee705..034a7de 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 6f96dba..e8bc3e4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index 2b547cd..dc3dd2b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 a65d7ba..e6a82e5 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
index 31168d2..4eb032a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 0a96486..5bf8a62 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 b1893b0..5066a0c 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.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
index 8779ef7..ac11465 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
public class DataStoragePreference implements org.apache.thrift.TBase<DataStoragePreference, DataStoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<DataStoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 990bfda..ce87de3 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
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* List of resource preferences for each of the registered compute resources.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 97ede66..3984b71 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 661d2d2..9f9fe89 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 4d69e65..0766291 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 25cff19..c880200 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 1df8246..8c96ca5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 f4c2056..76004d4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 b13669a..b33732c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 6587766..2a4d99d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 f22816b..532aa99 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 b0bf263..1c78d97 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 173fd6c..ebdb1be 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 2ada6ec..2868aa7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 a8ae5c8..b08c3de 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 f1155e9..d26f968 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 ac81365..97ae684 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 6487978..cde54b0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 d4d8b22..a49237a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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");
@@ -88,6 +88,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static final org.apache.thrift.protocol.TField EXPERIMENT_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentOutputs", org.apache.thrift.protocol.TType.LIST, (short)15);
private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)16);
private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)17);
+ private static final org.apache.thrift.protocol.TField PROCESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("processes", org.apache.thrift.protocol.TType.LIST, (short)18);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -112,6 +113,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
private org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
private List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
+ private List<org.apache.airavata.model.process.ProcessModel> processes; // 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 {
@@ -135,7 +137,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
EXPERIMENT_INPUTS((short)14, "experimentInputs"),
EXPERIMENT_OUTPUTS((short)15, "experimentOutputs"),
EXPERIMENT_STATUS((short)16, "experimentStatus"),
- ERRORS((short)17, "errors");
+ ERRORS((short)17, "errors"),
+ PROCESSES((short)18, "processes");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -184,6 +187,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return EXPERIMENT_STATUS;
case 17: // ERRORS
return ERRORS;
+ case 18: // PROCESSES
+ return PROCESSES;
default:
return null;
}
@@ -227,7 +232,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static final int __CREATIONTIME_ISSET_ID = 0;
private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS};
+ private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES};
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);
@@ -269,6 +274,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
+ tmpMap.put(_Fields.PROCESSES, new org.apache.thrift.meta_data.FieldMetaData("processes", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.process.ProcessModel.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExperimentModel.class, metaDataMap);
}
@@ -362,6 +370,13 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
this.errors = __this__errors;
}
+ if (other.isSetProcesses()) {
+ List<org.apache.airavata.model.process.ProcessModel> __this__processes = new ArrayList<org.apache.airavata.model.process.ProcessModel>(other.processes.size());
+ for (org.apache.airavata.model.process.ProcessModel other_element : other.processes) {
+ __this__processes.add(new org.apache.airavata.model.process.ProcessModel(other_element));
+ }
+ this.processes = __this__processes;
+ }
}
public ExperimentModel deepCopy() {
@@ -391,6 +406,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
this.experimentOutputs = null;
this.experimentStatus = null;
this.errors = null;
+ this.processes = null;
}
public String getExperimentId() {
@@ -850,6 +866,44 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
}
+ public int getProcessesSize() {
+ return (this.processes == null) ? 0 : this.processes.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.process.ProcessModel> getProcessesIterator() {
+ return (this.processes == null) ? null : this.processes.iterator();
+ }
+
+ public void addToProcesses(org.apache.airavata.model.process.ProcessModel elem) {
+ if (this.processes == null) {
+ this.processes = new ArrayList<org.apache.airavata.model.process.ProcessModel>();
+ }
+ this.processes.add(elem);
+ }
+
+ public List<org.apache.airavata.model.process.ProcessModel> getProcesses() {
+ return this.processes;
+ }
+
+ public void setProcesses(List<org.apache.airavata.model.process.ProcessModel> processes) {
+ this.processes = processes;
+ }
+
+ public void unsetProcesses() {
+ this.processes = null;
+ }
+
+ /** Returns true if field processes is set (has been assigned a value) and false otherwise */
+ public boolean isSetProcesses() {
+ return this.processes != null;
+ }
+
+ public void setProcessesIsSet(boolean value) {
+ if (!value) {
+ this.processes = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case EXPERIMENT_ID:
@@ -988,6 +1042,14 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
break;
+ case PROCESSES:
+ if (value == null) {
+ unsetProcesses();
+ } else {
+ setProcesses((List<org.apache.airavata.model.process.ProcessModel>)value);
+ }
+ break;
+
}
}
@@ -1044,6 +1106,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
case ERRORS:
return getErrors();
+ case PROCESSES:
+ return getProcesses();
+
}
throw new IllegalStateException();
}
@@ -1089,6 +1154,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return isSetExperimentStatus();
case ERRORS:
return isSetErrors();
+ case PROCESSES:
+ return isSetProcesses();
}
throw new IllegalStateException();
}
@@ -1259,6 +1326,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return false;
}
+ boolean this_present_processes = true && this.isSetProcesses();
+ boolean that_present_processes = true && that.isSetProcesses();
+ if (this_present_processes || that_present_processes) {
+ if (!(this_present_processes && that_present_processes))
+ return false;
+ if (!this.processes.equals(that.processes))
+ return false;
+ }
+
return true;
}
@@ -1351,6 +1427,11 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (present_errors)
list.add(errors);
+ boolean present_processes = true && (isSetProcesses());
+ list.add(present_processes);
+ if (present_processes)
+ list.add(processes);
+
return list.hashCode();
}
@@ -1532,6 +1613,16 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetProcesses()).compareTo(other.isSetProcesses());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetProcesses()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processes, other.processes);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1701,6 +1792,16 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
first = false;
}
+ if (isSetProcesses()) {
+ if (!first) sb.append(", ");
+ sb.append("processes:");
+ if (this.processes == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.processes);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1957,6 +2058,25 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 18: // PROCESSES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
+ struct.processes = new ArrayList<org.apache.airavata.model.process.ProcessModel>(_list12.size);
+ org.apache.airavata.model.process.ProcessModel _elem13;
+ for (int _i14 = 0; _i14 < _list12.size; ++_i14)
+ {
+ _elem13 = new org.apache.airavata.model.process.ProcessModel();
+ _elem13.read(iprot);
+ struct.processes.add(_elem13);
+ }
+ iprot.readListEnd();
+ }
+ struct.setProcessesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2036,9 +2156,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldBegin(EMAIL_ADDRESSES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.emailAddresses.size()));
- for (String _iter12 : struct.emailAddresses)
+ for (String _iter15 : struct.emailAddresses)
{
- oprot.writeString(_iter12);
+ oprot.writeString(_iter15);
}
oprot.writeListEnd();
}
@@ -2057,9 +2177,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldBegin(EXPERIMENT_INPUTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.experimentInputs.size()));
- for (org.apache.airavata.model.application.io.InputDataObjectType _iter13 : struct.experimentInputs)
+ for (org.apache.airavata.model.application.io.InputDataObjectType _iter16 : struct.experimentInputs)
{
- _iter13.write(oprot);
+ _iter16.write(oprot);
}
oprot.writeListEnd();
}
@@ -2071,9 +2191,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldBegin(EXPERIMENT_OUTPUTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.experimentOutputs.size()));
- for (org.apache.airavata.model.application.io.OutputDataObjectType _iter14 : struct.experimentOutputs)
+ for (org.apache.airavata.model.application.io.OutputDataObjectType _iter17 : struct.experimentOutputs)
{
- _iter14.write(oprot);
+ _iter17.write(oprot);
}
oprot.writeListEnd();
}
@@ -2092,9 +2212,23 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldBegin(ERRORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size()));
- for (org.apache.airavata.model.commons.ErrorModel _iter15 : struct.errors)
+ for (org.apache.airavata.model.commons.ErrorModel _iter18 : struct.errors)
{
- _iter15.write(oprot);
+ _iter18.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.processes != null) {
+ if (struct.isSetProcesses()) {
+ oprot.writeFieldBegin(PROCESSES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processes.size()));
+ for (org.apache.airavata.model.process.ProcessModel _iter19 : struct.processes)
+ {
+ _iter19.write(oprot);
}
oprot.writeListEnd();
}
@@ -2158,7 +2292,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetErrors()) {
optionals.set(10);
}
- oprot.writeBitSet(optionals, 11);
+ if (struct.isSetProcesses()) {
+ optionals.set(11);
+ }
+ oprot.writeBitSet(optionals, 12);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -2177,9 +2314,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetEmailAddresses()) {
{
oprot.writeI32(struct.emailAddresses.size());
- for (String _iter16 : struct.emailAddresses)
+ for (String _iter20 : struct.emailAddresses)
{
- oprot.writeString(_iter16);
+ oprot.writeString(_iter20);
}
}
}
@@ -2189,18 +2326,18 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetExperimentInputs()) {
{
oprot.writeI32(struct.experimentInputs.size());
- for (org.apache.airavata.model.application.io.InputDataObjectType _iter17 : struct.experimentInputs)
+ for (org.apache.airavata.model.application.io.InputDataObjectType _iter21 : struct.experimentInputs)
{
- _iter17.write(oprot);
+ _iter21.write(oprot);
}
}
}
if (struct.isSetExperimentOutputs()) {
{
oprot.writeI32(struct.experimentOutputs.size());
- for (org.apache.airavata.model.application.io.OutputDataObjectType _iter18 : struct.experimentOutputs)
+ for (org.apache.airavata.model.application.io.OutputDataObjectType _iter22 : struct.experimentOutputs)
{
- _iter18.write(oprot);
+ _iter22.write(oprot);
}
}
}
@@ -2210,9 +2347,18 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetErrors()) {
{
oprot.writeI32(struct.errors.size());
- for (org.apache.airavata.model.commons.ErrorModel _iter19 : struct.errors)
+ for (org.apache.airavata.model.commons.ErrorModel _iter23 : struct.errors)
+ {
+ _iter23.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetProcesses()) {
+ {
+ oprot.writeI32(struct.processes.size());
+ for (org.apache.airavata.model.process.ProcessModel _iter24 : struct.processes)
{
- _iter19.write(oprot);
+ _iter24.write(oprot);
}
}
}
@@ -2233,7 +2379,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setUserNameIsSet(true);
struct.experimentName = iprot.readString();
struct.setExperimentNameIsSet(true);
- BitSet incoming = iprot.readBitSet(11);
+ BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -2256,13 +2402,13 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.emailAddresses = new ArrayList<String>(_list20.size);
- String _elem21;
- for (int _i22 = 0; _i22 < _list20.size; ++_i22)
+ org.apache.thrift.protocol.TList _list25 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.emailAddresses = new ArrayList<String>(_list25.size);
+ String _elem26;
+ for (int _i27 = 0; _i27 < _list25.size; ++_i27)
{
- _elem21 = iprot.readString();
- struct.emailAddresses.add(_elem21);
+ _elem26 = iprot.readString();
+ struct.emailAddresses.add(_elem26);
}
}
struct.setEmailAddressesIsSet(true);
@@ -2274,28 +2420,28 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
if (incoming.get(7)) {
{
- org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.experimentInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list23.size);
- org.apache.airavata.model.application.io.InputDataObjectType _elem24;
- for (int _i25 = 0; _i25 < _list23.size; ++_i25)
+ org.apache.thrift.protocol.TList _list28 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.experimentInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list28.size);
+ org.apache.airavata.model.application.io.InputDataObjectType _elem29;
+ for (int _i30 = 0; _i30 < _list28.size; ++_i30)
{
- _elem24 = new org.apache.airavata.model.application.io.InputDataObjectType();
- _elem24.read(iprot);
- struct.experimentInputs.add(_elem24);
+ _elem29 = new org.apache.airavata.model.application.io.InputDataObjectType();
+ _elem29.read(iprot);
+ struct.experimentInputs.add(_elem29);
}
}
struct.setExperimentInputsIsSet(true);
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TList _list26 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.experimentOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list26.size);
- org.apache.airavata.model.application.io.OutputDataObjectType _elem27;
- for (int _i28 = 0; _i28 < _list26.size; ++_i28)
+ org.apache.thrift.protocol.TList _list31 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.experimentOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list31.size);
+ org.apache.airavata.model.application.io.OutputDataObjectType _elem32;
+ for (int _i33 = 0; _i33 < _list31.size; ++_i33)
{
- _elem27 = new org.apache.airavata.model.application.io.OutputDataObjectType();
- _elem27.read(iprot);
- struct.experimentOutputs.add(_elem27);
+ _elem32 = new org.apache.airavata.model.application.io.OutputDataObjectType();
+ _elem32.read(iprot);
+ struct.experimentOutputs.add(_elem32);
}
}
struct.setExperimentOutputsIsSet(true);
@@ -2307,18 +2453,32 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
if (incoming.get(10)) {
{
- org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.errors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list29.size);
- org.apache.airavata.model.commons.ErrorModel _elem30;
- for (int _i31 = 0; _i31 < _list29.size; ++_i31)
+ org.apache.thrift.protocol.TList _list34 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.errors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list34.size);
+ org.apache.airavata.model.commons.ErrorModel _elem35;
+ for (int _i36 = 0; _i36 < _list34.size; ++_i36)
{
- _elem30 = new org.apache.airavata.model.commons.ErrorModel();
- _elem30.read(iprot);
- struct.errors.add(_elem30);
+ _elem35 = new org.apache.airavata.model.commons.ErrorModel();
+ _elem35.read(iprot);
+ struct.errors.add(_elem35);
}
}
struct.setErrorsIsSet(true);
}
+ if (incoming.get(11)) {
+ {
+ org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.processes = new ArrayList<org.apache.airavata.model.process.ProcessModel>(_list37.size);
+ org.apache.airavata.model.process.ProcessModel _elem38;
+ for (int _i39 = 0; _i39 < _list37.size; ++_i39)
+ {
+ _elem38 = new org.apache.airavata.model.process.ProcessModel();
+ _elem38.read(iprot);
+ struct.processes.add(_elem38);
+ }
+ }
+ struct.setProcessesIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 6007f5b..8c63c02 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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");
@@ -1410,14 +1410,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 7: // ALL_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
- struct.allExperiments = new ArrayList<ExperimentSummaryModel>(_list32.size);
- ExperimentSummaryModel _elem33;
- for (int _i34 = 0; _i34 < _list32.size; ++_i34)
+ org.apache.thrift.protocol.TList _list40 = iprot.readListBegin();
+ struct.allExperiments = new ArrayList<ExperimentSummaryModel>(_list40.size);
+ ExperimentSummaryModel _elem41;
+ for (int _i42 = 0; _i42 < _list40.size; ++_i42)
{
- _elem33 = new ExperimentSummaryModel();
- _elem33.read(iprot);
- struct.allExperiments.add(_elem33);
+ _elem41 = new ExperimentSummaryModel();
+ _elem41.read(iprot);
+ struct.allExperiments.add(_elem41);
}
iprot.readListEnd();
}
@@ -1429,14 +1429,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 8: // COMPLETED_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
- struct.completedExperiments = new ArrayList<ExperimentSummaryModel>(_list35.size);
- ExperimentSummaryModel _elem36;
- for (int _i37 = 0; _i37 < _list35.size; ++_i37)
+ org.apache.thrift.protocol.TList _list43 = iprot.readListBegin();
+ struct.completedExperiments = new ArrayList<ExperimentSummaryModel>(_list43.size);
+ ExperimentSummaryModel _elem44;
+ for (int _i45 = 0; _i45 < _list43.size; ++_i45)
{
- _elem36 = new ExperimentSummaryModel();
- _elem36.read(iprot);
- struct.completedExperiments.add(_elem36);
+ _elem44 = new ExperimentSummaryModel();
+ _elem44.read(iprot);
+ struct.completedExperiments.add(_elem44);
}
iprot.readListEnd();
}
@@ -1448,14 +1448,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 9: // FAILED_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
- struct.failedExperiments = new ArrayList<ExperimentSummaryModel>(_list38.size);
- ExperimentSummaryModel _elem39;
- for (int _i40 = 0; _i40 < _list38.size; ++_i40)
+ org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
+ struct.failedExperiments = new ArrayList<ExperimentSummaryModel>(_list46.size);
+ ExperimentSummaryModel _elem47;
+ for (int _i48 = 0; _i48 < _list46.size; ++_i48)
{
- _elem39 = new ExperimentSummaryModel();
- _elem39.read(iprot);
- struct.failedExperiments.add(_elem39);
+ _elem47 = new ExperimentSummaryModel();
+ _elem47.read(iprot);
+ struct.failedExperiments.add(_elem47);
}
iprot.readListEnd();
}
@@ -1467,14 +1467,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 10: // CANCELLED_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list41 = iprot.readListBegin();
- struct.cancelledExperiments = new ArrayList<ExperimentSummaryModel>(_list41.size);
- ExperimentSummaryModel _elem42;
- for (int _i43 = 0; _i43 < _list41.size; ++_i43)
+ org.apache.thrift.protocol.TList _list49 = iprot.readListBegin();
+ struct.cancelledExperiments = new ArrayList<ExperimentSummaryModel>(_list49.size);
+ ExperimentSummaryModel _elem50;
+ for (int _i51 = 0; _i51 < _list49.size; ++_i51)
{
- _elem42 = new ExperimentSummaryModel();
- _elem42.read(iprot);
- struct.cancelledExperiments.add(_elem42);
+ _elem50 = new ExperimentSummaryModel();
+ _elem50.read(iprot);
+ struct.cancelledExperiments.add(_elem50);
}
iprot.readListEnd();
}
@@ -1486,14 +1486,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 11: // CREATED_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list44 = iprot.readListBegin();
- struct.createdExperiments = new ArrayList<ExperimentSummaryModel>(_list44.size);
- ExperimentSummaryModel _elem45;
- for (int _i46 = 0; _i46 < _list44.size; ++_i46)
+ org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
+ struct.createdExperiments = new ArrayList<ExperimentSummaryModel>(_list52.size);
+ ExperimentSummaryModel _elem53;
+ for (int _i54 = 0; _i54 < _list52.size; ++_i54)
{
- _elem45 = new ExperimentSummaryModel();
- _elem45.read(iprot);
- struct.createdExperiments.add(_elem45);
+ _elem53 = new ExperimentSummaryModel();
+ _elem53.read(iprot);
+ struct.createdExperiments.add(_elem53);
}
iprot.readListEnd();
}
@@ -1505,14 +1505,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
case 12: // RUNNING_EXPERIMENTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list47 = iprot.readListBegin();
- struct.runningExperiments = new ArrayList<ExperimentSummaryModel>(_list47.size);
- ExperimentSummaryModel _elem48;
- for (int _i49 = 0; _i49 < _list47.size; ++_i49)
+ org.apache.thrift.protocol.TList _list55 = iprot.readListBegin();
+ struct.runningExperiments = new ArrayList<ExperimentSummaryModel>(_list55.size);
+ ExperimentSummaryModel _elem56;
+ for (int _i57 = 0; _i57 < _list55.size; ++_i57)
{
- _elem48 = new ExperimentSummaryModel();
- _elem48.read(iprot);
- struct.runningExperiments.add(_elem48);
+ _elem56 = new ExperimentSummaryModel();
+ _elem56.read(iprot);
+ struct.runningExperiments.add(_elem56);
}
iprot.readListEnd();
}
@@ -1558,9 +1558,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(ALL_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.allExperiments.size()));
- for (ExperimentSummaryModel _iter50 : struct.allExperiments)
+ for (ExperimentSummaryModel _iter58 : struct.allExperiments)
{
- _iter50.write(oprot);
+ _iter58.write(oprot);
}
oprot.writeListEnd();
}
@@ -1571,9 +1571,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(COMPLETED_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.completedExperiments.size()));
- for (ExperimentSummaryModel _iter51 : struct.completedExperiments)
+ for (ExperimentSummaryModel _iter59 : struct.completedExperiments)
{
- _iter51.write(oprot);
+ _iter59.write(oprot);
}
oprot.writeListEnd();
}
@@ -1585,9 +1585,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(FAILED_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.failedExperiments.size()));
- for (ExperimentSummaryModel _iter52 : struct.failedExperiments)
+ for (ExperimentSummaryModel _iter60 : struct.failedExperiments)
{
- _iter52.write(oprot);
+ _iter60.write(oprot);
}
oprot.writeListEnd();
}
@@ -1599,9 +1599,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(CANCELLED_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.cancelledExperiments.size()));
- for (ExperimentSummaryModel _iter53 : struct.cancelledExperiments)
+ for (ExperimentSummaryModel _iter61 : struct.cancelledExperiments)
{
- _iter53.write(oprot);
+ _iter61.write(oprot);
}
oprot.writeListEnd();
}
@@ -1613,9 +1613,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(CREATED_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.createdExperiments.size()));
- for (ExperimentSummaryModel _iter54 : struct.createdExperiments)
+ for (ExperimentSummaryModel _iter62 : struct.createdExperiments)
{
- _iter54.write(oprot);
+ _iter62.write(oprot);
}
oprot.writeListEnd();
}
@@ -1627,9 +1627,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeFieldBegin(RUNNING_EXPERIMENTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.runningExperiments.size()));
- for (ExperimentSummaryModel _iter55 : struct.runningExperiments)
+ for (ExperimentSummaryModel _iter63 : struct.runningExperiments)
{
- _iter55.write(oprot);
+ _iter63.write(oprot);
}
oprot.writeListEnd();
}
@@ -1660,9 +1660,9 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
oprot.writeI32(struct.runningExperimentCount);
{
oprot.writeI32(struct.allExperiments.size());
- for (ExperimentSummaryModel _iter56 : struct.allExperiments)
+ for (ExperimentSummaryModel _iter64 : struct.allExperiments)
{
- _iter56.write(oprot);
+ _iter64.write(oprot);
}
}
BitSet optionals = new BitSet();
@@ -1691,45 +1691,45 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
if (struct.isSetCompletedExperiments()) {
{
oprot.writeI32(struct.completedExperiments.size());
- for (ExperimentSummaryModel _iter57 : struct.completedExperiments)
+ for (ExperimentSummaryModel _iter65 : struct.completedExperiments)
{
- _iter57.write(oprot);
+ _iter65.write(oprot);
}
}
}
if (struct.isSetFailedExperiments()) {
{
oprot.writeI32(struct.failedExperiments.size());
- for (ExperimentSummaryModel _iter58 : struct.failedExperiments)
+ for (ExperimentSummaryModel _iter66 : struct.failedExperiments)
{
- _iter58.write(oprot);
+ _iter66.write(oprot);
}
}
}
if (struct.isSetCancelledExperiments()) {
{
oprot.writeI32(struct.cancelledExperiments.size());
- for (ExperimentSummaryModel _iter59 : struct.cancelledExperiments)
+ for (ExperimentSummaryModel _iter67 : struct.cancelledExperiments)
{
- _iter59.write(oprot);
+ _iter67.write(oprot);
}
}
}
if (struct.isSetCreatedExperiments()) {
{
oprot.writeI32(struct.createdExperiments.size());
- for (ExperimentSummaryModel _iter60 : struct.createdExperiments)
+ for (ExperimentSummaryModel _iter68 : struct.createdExperiments)
{
- _iter60.write(oprot);
+ _iter68.write(oprot);
}
}
}
if (struct.isSetRunningExperiments()) {
{
oprot.writeI32(struct.runningExperiments.size());
- for (ExperimentSummaryModel _iter61 : struct.runningExperiments)
+ for (ExperimentSummaryModel _iter69 : struct.runningExperiments)
{
- _iter61.write(oprot);
+ _iter69.write(oprot);
}
}
}
@@ -1749,14 +1749,14 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
struct.runningExperimentCount = iprot.readI32();
struct.setRunningExperimentCountIsSet(true);
{
- org.apache.thrift.protocol.TList _list62 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.allExperiments = new ArrayList<ExperimentSummaryModel>(_list62.size);
- ExperimentSummaryModel _elem63;
- for (int _i64 = 0; _i64 < _list62.size; ++_i64)
+ org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.allExperiments = new ArrayList<ExperimentSummaryModel>(_list70.size);
+ ExperimentSummaryModel _elem71;
+ for (int _i72 = 0; _i72 < _list70.size; ++_i72)
{
- _elem63 = new ExperimentSummaryModel();
- _elem63.read(iprot);
- struct.allExperiments.add(_elem63);
+ _elem71 = new ExperimentSummaryModel();
+ _elem71.read(iprot);
+ struct.allExperiments.add(_elem71);
}
}
struct.setAllExperimentsIsSet(true);
@@ -1767,70 +1767,70 @@ public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentS
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list65 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.completedExperiments = new ArrayList<ExperimentSummaryModel>(_list65.size);
- ExperimentSummaryModel _elem66;
- for (int _i67 = 0; _i67 < _list65.size; ++_i67)
+ org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.completedExperiments = new ArrayList<ExperimentSummaryModel>(_list73.size);
+ ExperimentSummaryModel _elem74;
+ for (int _i75 = 0; _i75 < _list73.size; ++_i75)
{
- _elem66 = new ExperimentSummaryModel();
- _elem66.read(iprot);
- struct.completedExperiments.add(_elem66);
+ _elem74 = new ExperimentSummaryModel();
+ _elem74.read(iprot);
+ struct.completedExperiments.add(_elem74);
}
}
struct.setCompletedExperimentsIsSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.failedExperiments = new ArrayList<ExperimentSummaryModel>(_list68.size);
- ExperimentSummaryModel _elem69;
- for (int _i70 = 0; _i70 < _list68.size; ++_i70)
+ org.apache.thrift.protocol.TList _list76 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.failedExperiments = new ArrayList<ExperimentSummaryModel>(_list76.size);
+ ExperimentSummaryModel _elem77;
+ for (int _i78 = 0; _i78 < _list76.size; ++_i78)
{
- _elem69 = new ExperimentSummaryModel();
- _elem69.read(iprot);
- struct.failedExperiments.add(_elem69);
+ _elem77 = new ExperimentSummaryModel();
+ _elem77.read(iprot);
+ struct.failedExperiments.add(_elem77);
}
}
struct.setFailedExperimentsIsSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.cancelledExperiments = new ArrayList<ExperimentSummaryModel>(_list71.size);
- ExperimentSummaryModel _elem72;
- for (int _i73 = 0; _i73 < _list71.size; ++_i73)
+ org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.cancelledExperiments = new ArrayList<ExperimentSummaryModel>(_list79.size);
+ ExperimentSummaryModel _elem80;
+ for (int _i81 = 0; _i81 < _list79.size; ++_i81)
{
- _elem72 = new ExperimentSummaryModel();
- _elem72.read(iprot);
- struct.cancelledExperiments.add(_elem72);
+ _elem80 = new ExperimentSummaryModel();
+ _elem80.read(iprot);
+ struct.cancelledExperiments.add(_elem80);
}
}
struct.setCancelledExperimentsIsSet(true);
}
if (incoming.get(4)) {
{
- org.apache.thrift.protocol.TList _list74 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.createdExperiments = new ArrayList<ExperimentSummaryModel>(_list74.size);
- ExperimentSummaryModel _elem75;
- for (int _i76 = 0; _i76 < _list74.size; ++_i76)
+ org.apache.thrift.protocol.TList _list82 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.createdExperiments = new ArrayList<ExperimentSummaryModel>(_list82.size);
+ ExperimentSummaryModel _elem83;
+ for (int _i84 = 0; _i84 < _list82.size; ++_i84)
{
- _elem75 = new ExperimentSummaryModel();
- _elem75.read(iprot);
- struct.createdExperiments.add(_elem75);
+ _elem83 = new ExperimentSummaryModel();
+ _elem83.read(iprot);
+ struct.createdExperiments.add(_elem83);
}
}
struct.setCreatedExperimentsIsSet(true);
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TList _list77 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.runningExperiments = new ArrayList<ExperimentSummaryModel>(_list77.size);
- ExperimentSummaryModel _elem78;
- for (int _i79 = 0; _i79 < _list77.size; ++_i79)
+ org.apache.thrift.protocol.TList _list85 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.runningExperiments = new ArrayList<ExperimentSummaryModel>(_list85.size);
+ ExperimentSummaryModel _elem86;
+ for (int _i87 = 0; _i87 < _list85.size; ++_i87)
{
- _elem78 = new ExperimentSummaryModel();
- _elem78.read(iprot);
- struct.runningExperiments.add(_elem78);
+ _elem86 = new ExperimentSummaryModel();
+ _elem86.read(iprot);
+ struct.runningExperiments.add(_elem86);
}
}
struct.setRunningExperimentsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 93f53ad..7095b14 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 6233631..f28c461 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 d488e39..88fb51f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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/ee330724/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 58ca4a7..9d2418e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
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");
[5/6] airavata git commit: adding getDetailedExperimentTree method
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee330724/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 6979347..3fe04c4 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-9")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-16")
public class Airavata {
public interface Iface {
@@ -506,6 +506,45 @@ public class Airavata {
public org.apache.airavata.model.experiment.ExperimentModel getExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param authzToken
+ * @param airavataExperimentId
+ */
+ public org.apache.airavata.model.experiment.ExperimentModel getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -1846,6 +1885,8 @@ public class Airavata {
public void getExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
public void updateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.model.experiment.ExperimentModel experiment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateExperimentConfiguration(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.model.experiment.UserConfigurationDataModel userConfiguration, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -3149,6 +3190,45 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getExperiment failed: unknown result");
}
+ public org.apache.airavata.model.experiment.ExperimentModel getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ {
+ send_getDetailedExperimentTree(authzToken, airavataExperimentId);
+ return recv_getDetailedExperimentTree();
+ }
+
+ public void send_getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.thrift.TException
+ {
+ getDetailedExperimentTree_args args = new getDetailedExperimentTree_args();
+ args.setAuthzToken(authzToken);
+ args.setAiravataExperimentId(airavataExperimentId);
+ sendBase("getDetailedExperimentTree", args);
+ }
+
+ public org.apache.airavata.model.experiment.ExperimentModel recv_getDetailedExperimentTree() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ {
+ getDetailedExperimentTree_result result = new getDetailedExperimentTree_result();
+ receiveBase(result, "getDetailedExperimentTree");
+ if (result.isSetSuccess()) {
+ 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 org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDetailedExperimentTree failed: unknown result");
+ }
+
public void updateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.model.experiment.ExperimentModel experiment) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
send_updateExperiment(authzToken, airavataExperimentId, experiment);
@@ -7792,6 +7872,41 @@ public class Airavata {
}
}
+ public void getDetailedExperimentTree(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ getDetailedExperimentTree_call method_call = new getDetailedExperimentTree_call(authzToken, airavataExperimentId, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class getDetailedExperimentTree_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private org.apache.airavata.model.security.AuthzToken authzToken;
+ private String airavataExperimentId;
+ public getDetailedExperimentTree_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, 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.airavataExperimentId = airavataExperimentId;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getDetailedExperimentTree", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getDetailedExperimentTree_args args = new getDetailedExperimentTree_args();
+ args.setAuthzToken(authzToken);
+ args.setAiravataExperimentId(airavataExperimentId);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public org.apache.airavata.model.experiment.ExperimentModel getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, 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_getDetailedExperimentTree();
+ }
+ }
+
public void updateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.airavata.model.experiment.ExperimentModel experiment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
updateExperiment_call method_call = new updateExperiment_call(authzToken, airavataExperimentId, experiment, resultHandler, this, ___protocolFactory, ___transport);
@@ -11333,6 +11448,7 @@ public class Airavata {
processMap.put("createExperiment", new createExperiment());
processMap.put("deleteExperiment", new deleteExperiment());
processMap.put("getExperiment", new getExperiment());
+ processMap.put("getDetailedExperimentTree", new getDetailedExperimentTree());
processMap.put("updateExperiment", new updateExperiment());
processMap.put("updateExperimentConfiguration", new updateExperimentConfiguration());
processMap.put("updateResourceScheduleing", new updateResourceScheduleing());
@@ -12309,6 +12425,38 @@ public class Airavata {
}
}
+ public static class getDetailedExperimentTree<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDetailedExperimentTree_args> {
+ public getDetailedExperimentTree() {
+ super("getDetailedExperimentTree");
+ }
+
+ public getDetailedExperimentTree_args getEmptyArgsInstance() {
+ return new getDetailedExperimentTree_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getDetailedExperimentTree_result getResult(I iface, getDetailedExperimentTree_args args) throws org.apache.thrift.TException {
+ getDetailedExperimentTree_result result = new getDetailedExperimentTree_result();
+ try {
+ result.success = iface.getDetailedExperimentTree(args.authzToken, args.airavataExperimentId);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.ExperimentNotFoundException enf) {
+ result.enf = enf;
+ } 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 updateExperiment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateExperiment_args> {
public updateExperiment() {
super("updateExperiment");
@@ -15244,6 +15392,7 @@ public class Airavata {
processMap.put("createExperiment", new createExperiment());
processMap.put("deleteExperiment", new deleteExperiment());
processMap.put("getExperiment", new getExperiment());
+ processMap.put("getDetailedExperimentTree", new getDetailedExperimentTree());
processMap.put("updateExperiment", new updateExperiment());
processMap.put("updateExperimentConfiguration", new updateExperimentConfiguration());
processMap.put("updateResourceScheduleing", new updateResourceScheduleing());
@@ -17442,20 +17591,21 @@ public class Airavata {
}
}
- public static class updateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperiment_args, Void> {
- public updateExperiment() {
- super("updateExperiment");
+ 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 updateExperiment_args getEmptyArgsInstance() {
- return new updateExperiment_args();
+ public getDetailedExperimentTree_args getEmptyArgsInstance() {
+ return new getDetailedExperimentTree_args();
}
- public AsyncMethodCallback<Void> 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<Void>() {
- public void onComplete(Void o) {
- updateExperiment_result result = new updateExperiment_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);
return;
@@ -17467,7 +17617,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- updateExperiment_result result = new updateExperiment_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);
@@ -17513,139 +17663,25 @@ public class Airavata {
return false;
}
- 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 updateExperimentConfiguration<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperimentConfiguration_args, Void> {
- public updateExperimentConfiguration() {
- super("updateExperimentConfiguration");
- }
-
- public updateExperimentConfiguration_args getEmptyArgsInstance() {
- return new updateExperimentConfiguration_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) {
- updateExperimentConfiguration_result result = new updateExperimentConfiguration_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;
- 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;
- }
- 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, updateExperimentConfiguration_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.updateExperimentConfiguration(args.authzToken, args.airavataExperimentId, args.userConfiguration,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 updateResourceScheduleing<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceScheduleing_args, Void> {
- public updateResourceScheduleing() {
- super("updateResourceScheduleing");
+ public static class updateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperiment_args, Void> {
+ public updateExperiment() {
+ super("updateExperiment");
}
- public updateResourceScheduleing_args getEmptyArgsInstance() {
- return new updateResourceScheduleing_args();
+ public updateExperiment_args getEmptyArgsInstance() {
+ return new updateExperiment_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) {
- updateResourceScheduleing_result result = new updateResourceScheduleing_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;
- 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;
- }
- 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, updateResourceScheduleing_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.updateResourceScheduleing(args.authzToken, args.airavataExperimentId, args.resourceScheduling,resultHandler);
- }
- }
-
- public static class validateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validateExperiment_args, Boolean> {
- public validateExperiment() {
- super("validateExperiment");
- }
-
- public validateExperiment_args getEmptyArgsInstance() {
- return new validateExperiment_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) {
- validateExperiment_result result = new validateExperiment_result();
- result.success = o;
- result.setSuccessIsSet(true);
+ updateExperiment_result result = new updateExperiment_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -17657,7 +17693,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- validateExperiment_result result = new validateExperiment_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);
@@ -17703,25 +17739,25 @@ public class Airavata {
return false;
}
- public void start(I iface, validateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.validateExperiment(args.authzToken, args.airavataExperimentId,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 launchExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, launchExperiment_args, Void> {
- public launchExperiment() {
- super("launchExperiment");
+ public static class updateExperimentConfiguration<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateExperimentConfiguration_args, Void> {
+ public updateExperimentConfiguration() {
+ super("updateExperimentConfiguration");
}
- public launchExperiment_args getEmptyArgsInstance() {
- return new launchExperiment_args();
+ public updateExperimentConfiguration_args getEmptyArgsInstance() {
+ return new updateExperimentConfiguration_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) {
- launchExperiment_result result = new launchExperiment_result();
+ updateExperimentConfiguration_result result = new updateExperimentConfiguration_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -17733,28 +17769,64 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- launchExperiment_result result = new launchExperiment_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
+ 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;
}
- 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
+ {
+ 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());
}
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
}
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ 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 updateResourceScheduleing<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateResourceScheduleing_args, Void> {
+ public updateResourceScheduleing() {
+ super("updateResourceScheduleing");
+ }
+
+ public updateResourceScheduleing_args getEmptyArgsInstance() {
+ return new updateResourceScheduleing_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) {
+ updateResourceScheduleing_result result = new updateResourceScheduleing_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);
}
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ 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;
@@ -17779,26 +17851,27 @@ public class Airavata {
return false;
}
- public void start(I iface, launchExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,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 getExperimentStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatus_args, org.apache.airavata.model.status.ExperimentStatus> {
- public getExperimentStatus() {
- super("getExperimentStatus");
+ public static class validateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, validateExperiment_args, Boolean> {
+ public validateExperiment() {
+ super("validateExperiment");
}
- public getExperimentStatus_args getEmptyArgsInstance() {
- return new getExperimentStatus_args();
+ public validateExperiment_args getEmptyArgsInstance() {
+ return new validateExperiment_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.status.ExperimentStatus> 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<org.apache.airavata.model.status.ExperimentStatus>() {
- public void onComplete(org.apache.airavata.model.status.ExperimentStatus o) {
- getExperimentStatus_result result = new getExperimentStatus_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ validateExperiment_result result = new validateExperiment_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -17810,7 +17883,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentStatus_result result = new getExperimentStatus_result();
+ validateExperiment_result result = new validateExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -17856,26 +17929,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentStatus_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.status.ExperimentStatus> resultHandler) throws TException {
- iface.getExperimentStatus(args.authzToken, args.airavataExperimentId,resultHandler);
+ public void start(I iface, validateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.validateExperiment(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class getExperimentOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentOutputs_args, List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
- public getExperimentOutputs() {
- super("getExperimentOutputs");
+ public static class launchExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, launchExperiment_args, Void> {
+ public launchExperiment() {
+ super("launchExperiment");
}
- public getExperimentOutputs_args getEmptyArgsInstance() {
- return new getExperimentOutputs_args();
+ public launchExperiment_args getEmptyArgsInstance() {
+ return new launchExperiment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> 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.application.io.OutputDataObjectType>>() {
- public void onComplete(List<org.apache.airavata.model.application.io.OutputDataObjectType> o) {
- getExperimentOutputs_result result = new getExperimentOutputs_result();
- result.success = o;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ launchExperiment_result result = new launchExperiment_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -17887,7 +17959,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getExperimentOutputs_result result = new getExperimentOutputs_result();
+ launchExperiment_result result = new launchExperiment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -17933,25 +18005,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getExperimentOutputs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> resultHandler) throws TException {
- iface.getExperimentOutputs(args.authzToken, args.airavataExperimentId,resultHandler);
+ public void start(I iface, launchExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,resultHandler);
}
}
- public static class getIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputs_args, List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
- public getIntermediateOutputs() {
- super("getIntermediateOutputs");
+ public static class getExperimentStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentStatus_args, org.apache.airavata.model.status.ExperimentStatus> {
+ public getExperimentStatus() {
+ super("getExperimentStatus");
}
- public getIntermediateOutputs_args getEmptyArgsInstance() {
- return new getIntermediateOutputs_args();
+ public getExperimentStatus_args getEmptyArgsInstance() {
+ return new getExperimentStatus_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.status.ExperimentStatus> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>>() {
- public void onComplete(List<org.apache.airavata.model.application.io.OutputDataObjectType> o) {
- getIntermediateOutputs_result result = new getIntermediateOutputs_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.status.ExperimentStatus>() {
+ public void onComplete(org.apache.airavata.model.status.ExperimentStatus o) {
+ getExperimentStatus_result result = new getExperimentStatus_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -17964,7 +18036,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getIntermediateOutputs_result result = new getIntermediateOutputs_result();
+ getExperimentStatus_result result = new getExperimentStatus_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18010,25 +18082,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getIntermediateOutputs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> resultHandler) throws TException {
- iface.getIntermediateOutputs(args.authzToken, args.airavataExperimentId,resultHandler);
+ public void start(I iface, getExperimentStatus_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.status.ExperimentStatus> resultHandler) throws TException {
+ iface.getExperimentStatus(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class getJobStatuses<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobStatuses_args, Map<String,org.apache.airavata.model.status.JobStatus>> {
- public getJobStatuses() {
- super("getJobStatuses");
+ public static class getExperimentOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getExperimentOutputs_args, List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
+ public getExperimentOutputs() {
+ super("getExperimentOutputs");
}
- public getJobStatuses_args getEmptyArgsInstance() {
- return new getJobStatuses_args();
+ public getExperimentOutputs_args getEmptyArgsInstance() {
+ return new getExperimentOutputs_args();
}
- public AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>>() {
- public void onComplete(Map<String,org.apache.airavata.model.status.JobStatus> o) {
- getJobStatuses_result result = new getJobStatuses_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>>() {
+ public void onComplete(List<org.apache.airavata.model.application.io.OutputDataObjectType> o) {
+ getExperimentOutputs_result result = new getExperimentOutputs_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18041,7 +18113,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getJobStatuses_result result = new getJobStatuses_result();
+ getExperimentOutputs_result result = new getExperimentOutputs_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18087,25 +18159,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getJobStatuses_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>> resultHandler) throws TException {
- iface.getJobStatuses(args.authzToken, args.airavataExperimentId,resultHandler);
+ public void start(I iface, getExperimentOutputs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> resultHandler) throws TException {
+ iface.getExperimentOutputs(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class getJobDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobDetails_args, List<org.apache.airavata.model.job.JobModel>> {
- public getJobDetails() {
- super("getJobDetails");
+ public static class getIntermediateOutputs<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getIntermediateOutputs_args, List<org.apache.airavata.model.application.io.OutputDataObjectType>> {
+ public getIntermediateOutputs() {
+ super("getIntermediateOutputs");
}
- public getJobDetails_args getEmptyArgsInstance() {
- return new getJobDetails_args();
+ public getIntermediateOutputs_args getEmptyArgsInstance() {
+ return new getIntermediateOutputs_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>>() {
- public void onComplete(List<org.apache.airavata.model.job.JobModel> o) {
- getJobDetails_result result = new getJobDetails_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>>() {
+ public void onComplete(List<org.apache.airavata.model.application.io.OutputDataObjectType> o) {
+ getIntermediateOutputs_result result = new getIntermediateOutputs_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18118,7 +18190,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getJobDetails_result result = new getJobDetails_result();
+ getIntermediateOutputs_result result = new getIntermediateOutputs_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18164,25 +18236,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getJobDetails_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>> resultHandler) throws TException {
- iface.getJobDetails(args.authzToken, args.airavataExperimentId,resultHandler);
+ public void start(I iface, getIntermediateOutputs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.application.io.OutputDataObjectType>> resultHandler) throws TException {
+ iface.getIntermediateOutputs(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class cloneExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperiment_args, String> {
- public cloneExperiment() {
- super("cloneExperiment");
+ public static class getJobStatuses<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobStatuses_args, Map<String,org.apache.airavata.model.status.JobStatus>> {
+ public getJobStatuses() {
+ super("getJobStatuses");
}
- public cloneExperiment_args getEmptyArgsInstance() {
- return new cloneExperiment_args();
+ public getJobStatuses_args getEmptyArgsInstance() {
+ return new getJobStatuses_args();
}
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- cloneExperiment_result result = new cloneExperiment_result();
+ return new AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>>() {
+ public void onComplete(Map<String,org.apache.airavata.model.status.JobStatus> o) {
+ getJobStatuses_result result = new getJobStatuses_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18195,7 +18267,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- cloneExperiment_result result = new cloneExperiment_result();
+ getJobStatuses_result result = new getJobStatuses_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18241,25 +18313,26 @@ public class Airavata {
return false;
}
- public void start(I iface, cloneExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.cloneExperiment(args.authzToken, args.existingExperimentID, args.newExperimentName,resultHandler);
+ public void start(I iface, getJobStatuses_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,org.apache.airavata.model.status.JobStatus>> resultHandler) throws TException {
+ iface.getJobStatuses(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class terminateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, terminateExperiment_args, Void> {
- public terminateExperiment() {
- super("terminateExperiment");
+ public static class getJobDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getJobDetails_args, List<org.apache.airavata.model.job.JobModel>> {
+ public getJobDetails() {
+ super("getJobDetails");
}
- public terminateExperiment_args getEmptyArgsInstance() {
- return new terminateExperiment_args();
+ public getJobDetails_args getEmptyArgsInstance() {
+ return new getJobDetails_args();
}
- public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Void>() {
- public void onComplete(Void o) {
- terminateExperiment_result result = new terminateExperiment_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>>() {
+ public void onComplete(List<org.apache.airavata.model.job.JobModel> o) {
+ getJobDetails_result result = new getJobDetails_result();
+ result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -18271,7 +18344,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- terminateExperiment_result result = new terminateExperiment_result();
+ getJobDetails_result result = new getJobDetails_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18317,25 +18390,25 @@ public class Airavata {
return false;
}
- public void start(I iface, terminateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
- iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,resultHandler);
+ public void start(I iface, getJobDetails_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.job.JobModel>> resultHandler) throws TException {
+ iface.getJobDetails(args.authzToken, args.airavataExperimentId,resultHandler);
}
}
- public static class registerApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationModule_args, String> {
- public registerApplicationModule() {
- super("registerApplicationModule");
+ public static class cloneExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, cloneExperiment_args, String> {
+ public cloneExperiment() {
+ super("cloneExperiment");
}
- public registerApplicationModule_args getEmptyArgsInstance() {
- return new registerApplicationModule_args();
+ public cloneExperiment_args getEmptyArgsInstance() {
+ return new cloneExperiment_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) {
- registerApplicationModule_result result = new registerApplicationModule_result();
+ cloneExperiment_result result = new cloneExperiment_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18348,12 +18421,17 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- registerApplicationModule_result result = new registerApplicationModule_result();
+ cloneExperiment_result result = new cloneExperiment_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);
@@ -18389,26 +18467,25 @@ public class Airavata {
return false;
}
- public void start(I iface, registerApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.registerApplicationModule(args.authzToken, args.gatewayId, args.applicationModule,resultHandler);
+ public void start(I iface, cloneExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.cloneExperiment(args.authzToken, args.existingExperimentID, args.newExperimentName,resultHandler);
}
}
- public static class getApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationModule_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> {
- public getApplicationModule() {
- super("getApplicationModule");
+ public static class terminateExperiment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, terminateExperiment_args, Void> {
+ public terminateExperiment() {
+ super("terminateExperiment");
}
- public getApplicationModule_args getEmptyArgsInstance() {
- return new getApplicationModule_args();
+ public terminateExperiment_args getEmptyArgsInstance() {
+ return new terminateExperiment_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> 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<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>() {
- public void onComplete(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule o) {
- getApplicationModule_result result = new getApplicationModule_result();
- result.success = o;
+ return new AsyncMethodCallback<Void>() {
+ public void onComplete(Void o) {
+ terminateExperiment_result result = new terminateExperiment_result();
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -18420,12 +18497,17 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getApplicationModule_result result = new getApplicationModule_result();
+ terminateExperiment_result result = new terminateExperiment_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);
@@ -18461,27 +18543,26 @@ public class Airavata {
return false;
}
- public void start(I iface, getApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> resultHandler) throws TException {
- iface.getApplicationModule(args.authzToken, args.appModuleId,resultHandler);
+ public void start(I iface, terminateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+ iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,resultHandler);
}
}
- public static class updateApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationModule_args, Boolean> {
- public updateApplicationModule() {
- super("updateApplicationModule");
+ public static class registerApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationModule_args, String> {
+ public registerApplicationModule() {
+ super("registerApplicationModule");
}
- public updateApplicationModule_args getEmptyArgsInstance() {
- return new updateApplicationModule_args();
+ public registerApplicationModule_args getEmptyArgsInstance() {
+ return new registerApplicationModule_args();
}
- public AsyncMethodCallback<Boolean> 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<Boolean>() {
- public void onComplete(Boolean o) {
- updateApplicationModule_result result = new updateApplicationModule_result();
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ registerApplicationModule_result result = new registerApplicationModule_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -18493,7 +18574,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- updateApplicationModule_result result = new updateApplicationModule_result();
+ registerApplicationModule_result result = new registerApplicationModule_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18534,25 +18615,25 @@ public class Airavata {
return false;
}
- public void start(I iface, updateApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.updateApplicationModule(args.authzToken, args.appModuleId, args.applicationModule,resultHandler);
+ public void start(I iface, registerApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.registerApplicationModule(args.authzToken, args.gatewayId, args.applicationModule,resultHandler);
}
}
- public static class getAllAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllAppModules_args, List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> {
- public getAllAppModules() {
- super("getAllAppModules");
+ public static class getApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationModule_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> {
+ public getApplicationModule() {
+ super("getApplicationModule");
}
- public getAllAppModules_args getEmptyArgsInstance() {
- return new getAllAppModules_args();
+ public getApplicationModule_args getEmptyArgsInstance() {
+ return new getApplicationModule_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>>() {
- public void onComplete(List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> o) {
- getAllAppModules_result result = new getAllAppModules_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule o) {
+ getApplicationModule_result result = new getApplicationModule_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18565,7 +18646,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAllAppModules_result result = new getAllAppModules_result();
+ getApplicationModule_result result = new getApplicationModule_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18606,25 +18687,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getAllAppModules_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> resultHandler) throws TException {
- iface.getAllAppModules(args.authzToken, args.gatewayId,resultHandler);
+ public void start(I iface, getApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> resultHandler) throws TException {
+ iface.getApplicationModule(args.authzToken, args.appModuleId,resultHandler);
}
}
- public static class deleteApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationModule_args, Boolean> {
- public deleteApplicationModule() {
- super("deleteApplicationModule");
+ public static class updateApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationModule_args, Boolean> {
+ public updateApplicationModule() {
+ super("updateApplicationModule");
}
- public deleteApplicationModule_args getEmptyArgsInstance() {
- return new deleteApplicationModule_args();
+ public updateApplicationModule_args getEmptyArgsInstance() {
+ return new updateApplicationModule_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) {
- deleteApplicationModule_result result = new deleteApplicationModule_result();
+ updateApplicationModule_result result = new updateApplicationModule_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -18638,79 +18719,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteApplicationModule_result result = new deleteApplicationModule_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, deleteApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteApplicationModule(args.authzToken, args.appModuleId,resultHandler);
- }
- }
-
- public static class registerApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationDeployment_args, String> {
- public registerApplicationDeployment() {
- super("registerApplicationDeployment");
- }
-
- public registerApplicationDeployment_args getEmptyArgsInstance() {
- return new registerApplicationDeployment_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) {
- registerApplicationDeployment_result result = new registerApplicationDeployment_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;
- registerApplicationDeployment_result result = new registerApplicationDeployment_result();
+ updateApplicationModule_result result = new updateApplicationModule_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18751,25 +18760,25 @@ public class Airavata {
return false;
}
- public void start(I iface, registerApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.registerApplicationDeployment(args.authzToken, args.gatewayId, args.applicationDeployment,resultHandler);
+ public void start(I iface, updateApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateApplicationModule(args.authzToken, args.appModuleId, args.applicationModule,resultHandler);
}
}
- public static class getApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeployment_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> {
- public getApplicationDeployment() {
- super("getApplicationDeployment");
+ public static class getAllAppModules<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllAppModules_args, List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> {
+ public getAllAppModules() {
+ super("getAllAppModules");
}
- public getApplicationDeployment_args getEmptyArgsInstance() {
- return new getApplicationDeployment_args();
+ public getAllAppModules_args getEmptyArgsInstance() {
+ return new getAllAppModules_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>() {
- public void onComplete(org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription o) {
- getApplicationDeployment_result result = new getApplicationDeployment_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>>() {
+ public void onComplete(List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule> o) {
+ getAllAppModules_result result = new getAllAppModules_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -18782,7 +18791,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getApplicationDeployment_result result = new getApplicationDeployment_result();
+ getAllAppModules_result result = new getAllAppModules_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18823,25 +18832,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> resultHandler) throws TException {
- iface.getApplicationDeployment(args.authzToken, args.appDeploymentId,resultHandler);
+ public void start(I iface, getAllAppModules_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule>> resultHandler) throws TException {
+ iface.getAllAppModules(args.authzToken, args.gatewayId,resultHandler);
}
}
- public static class updateApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationDeployment_args, Boolean> {
- public updateApplicationDeployment() {
- super("updateApplicationDeployment");
+ public static class deleteApplicationModule<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationModule_args, Boolean> {
+ public deleteApplicationModule() {
+ super("deleteApplicationModule");
}
- public updateApplicationDeployment_args getEmptyArgsInstance() {
- return new updateApplicationDeployment_args();
+ public deleteApplicationModule_args getEmptyArgsInstance() {
+ return new deleteApplicationModule_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) {
- updateApplicationDeployment_result result = new updateApplicationDeployment_result();
+ deleteApplicationModule_result result = new deleteApplicationModule_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -18855,7 +18864,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- updateApplicationDeployment_result result = new updateApplicationDeployment_result();
+ deleteApplicationModule_result result = new deleteApplicationModule_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18896,27 +18905,26 @@ public class Airavata {
return false;
}
- public void start(I iface, updateApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.updateApplicationDeployment(args.authzToken, args.appDeploymentId, args.applicationDeployment,resultHandler);
+ public void start(I iface, deleteApplicationModule_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.deleteApplicationModule(args.authzToken, args.appModuleId,resultHandler);
}
}
- public static class deleteApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationDeployment_args, Boolean> {
- public deleteApplicationDeployment() {
- super("deleteApplicationDeployment");
+ public static class registerApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationDeployment_args, String> {
+ public registerApplicationDeployment() {
+ super("registerApplicationDeployment");
}
- public deleteApplicationDeployment_args getEmptyArgsInstance() {
- return new deleteApplicationDeployment_args();
+ public registerApplicationDeployment_args getEmptyArgsInstance() {
+ return new registerApplicationDeployment_args();
}
- public AsyncMethodCallback<Boolean> 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<Boolean>() {
- public void onComplete(Boolean o) {
- deleteApplicationDeployment_result result = new deleteApplicationDeployment_result();
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ registerApplicationDeployment_result result = new registerApplicationDeployment_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -18928,7 +18936,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteApplicationDeployment_result result = new deleteApplicationDeployment_result();
+ registerApplicationDeployment_result result = new registerApplicationDeployment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -18969,25 +18977,25 @@ public class Airavata {
return false;
}
- public void start(I iface, deleteApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteApplicationDeployment(args.authzToken, args.appDeploymentId,resultHandler);
+ public void start(I iface, registerApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.registerApplicationDeployment(args.authzToken, args.gatewayId, args.applicationDeployment,resultHandler);
}
}
- public static class getAllApplicationDeployments<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllApplicationDeployments_args, List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> {
- public getAllApplicationDeployments() {
- super("getAllApplicationDeployments");
+ public static class getApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getApplicationDeployment_args, org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> {
+ public getApplicationDeployment() {
+ super("getApplicationDeployment");
}
- public getAllApplicationDeployments_args getEmptyArgsInstance() {
- return new getAllApplicationDeployments_args();
+ public getApplicationDeployment_args getEmptyArgsInstance() {
+ return new getApplicationDeployment_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>>() {
- public void onComplete(List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> o) {
- getAllApplicationDeployments_result result = new getAllApplicationDeployments_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription o) {
+ getApplicationDeployment_result result = new getApplicationDeployment_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -19000,7 +19008,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAllApplicationDeployments_result result = new getAllApplicationDeployments_result();
+ getApplicationDeployment_result result = new getApplicationDeployment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19041,26 +19049,27 @@ public class Airavata {
return false;
}
- public void start(I iface, getAllApplicationDeployments_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription>> resultHandler) throws TException {
- iface.getAllApplicationDeployments(args.authzToken, args.gatewayId,resultHandler);
+ public void start(I iface, getApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription> resultHandler) throws TException {
+ iface.getApplicationDeployment(args.authzToken, args.appDeploymentId,resultHandler);
}
}
- public static class getAppModuleDeployedResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAppModuleDeployedResources_args, List<String>> {
- public getAppModuleDeployedResources() {
- super("getAppModuleDeployedResources");
+ public static class updateApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateApplicationDeployment_args, Boolean> {
+ public updateApplicationDeployment() {
+ super("updateApplicationDeployment");
}
- public getAppModuleDeployedResources_args getEmptyArgsInstance() {
- return new getAppModuleDeployedResources_args();
+ public updateApplicationDeployment_args getEmptyArgsInstance() {
+ return new updateApplicationDeployment_args();
}
- public AsyncMethodCallback<List<String>> 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<String>>() {
- public void onComplete(List<String> o) {
- getAppModuleDeployedResources_result result = new getAppModuleDeployedResources_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ updateApplicationDeployment_result result = new updateApplicationDeployment_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -19072,7 +19081,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAppModuleDeployedResources_result result = new getAppModuleDeployedResources_result();
+ updateApplicationDeployment_result result = new updateApplicationDeployment_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -19113,26 +19122,27 @@ public class Airavata {
return false;
}
- public void start(I iface, getAppModuleDeployedResources_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException {
- iface.getAppModuleDeployedResources(args.authzToken, args.appModuleId,resultHandler);
+ public void start(I iface, updateApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateApplicationDeployment(args.authzToken, args.appDeploymentId, args.applicationDeployment,resultHandler);
}
}
- public static class registerApplicationInterface<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerApplicationInterface_args, String> {
- public registerApplicationInterface() {
- super("registerApplicationInterface");
+ public static class deleteApplicationDeployment<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteApplicationDeployment_args, Boolean> {
+ public deleteApplicationDeployment() {
+ super("deleteApplicationDeployment");
}
- public registerApplicationInterface_args getEmptyArgsInstance() {
- return new registerApplicationInterface_args();
+ public deleteApplicationDeployment_args getEmptyArgsInstance() {
+ return new deleteApplicationDeployment_args();
}
- public AsyncMethodCallback<String> 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<String>() {
- public void onComplete(String o) {
- registerApplicationInterface_result result = new registerApplication
<TRUNCATED>