You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/07/02 20:06:10 UTC
git commit: adding generated code - AIRAVATA-1309
Repository: airavata
Updated Branches:
refs/heads/master 85348aec9 -> c60ba81c0
adding generated code - AIRAVATA-1309
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c60ba81c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c60ba81c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c60ba81c
Branch: refs/heads/master
Commit: c60ba81c0a4a2b8f9f7399327b84642ba7607407
Parents: 85348ae
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Jul 2 14:06:03 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Jul 2 14:06:03 2014 -0400
----------------------------------------------------------------------
.../resources/lib/experimentModel_types.cpp | 80 +++--
.../main/resources/lib/experimentModel_types.h | 55 ++--
.../Model/Workspace/Experiment/Types.php | 114 +++----
.../workspace/experiment/ExperimentState.java | 13 +-
.../model/workspace/experiment/TaskDetails.java | 315 +++++++------------
.../workspace/experiment/WorkflowNodeState.java | 13 +-
6 files changed, 230 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
index 02d648e..e4be44a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp
@@ -18,6 +18,7 @@ int _kExperimentStateValues[] = {
ExperimentState::EXECUTING,
ExperimentState::CANCELING,
ExperimentState::CANCELED,
+ ExperimentState::SUSPENDED,
ExperimentState::COMPLETED,
ExperimentState::FAILED,
ExperimentState::UNKNOWN
@@ -30,17 +31,19 @@ const char* _kExperimentStateNames[] = {
"EXECUTING",
"CANCELING",
"CANCELED",
+ "SUSPENDED",
"COMPLETED",
"FAILED",
"UNKNOWN"
};
-const std::map<int, const char*> _ExperimentState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(10, _kExperimentStateValues, _kExperimentStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _ExperimentState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(11, _kExperimentStateValues, _kExperimentStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kWorkflowNodeStateValues[] = {
WorkflowNodeState::INVOKED,
WorkflowNodeState::EXECUTING,
WorkflowNodeState::CANCELING,
WorkflowNodeState::CANCELED,
+ WorkflowNodeState::SUSPENDED,
WorkflowNodeState::COMPLETED,
WorkflowNodeState::FAILED,
WorkflowNodeState::UNKNOWN
@@ -50,11 +53,12 @@ const char* _kWorkflowNodeStateNames[] = {
"EXECUTING",
"CANCELING",
"CANCELED",
+ "SUSPENDED",
"COMPLETED",
"FAILED",
"UNKNOWN"
};
-const std::map<int, const char*> _WorkflowNodeState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kWorkflowNodeStateValues, _kWorkflowNodeStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _WorkflowNodeState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kWorkflowNodeStateValues, _kWorkflowNodeStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kTaskStateValues[] = {
TaskState::WAITING,
@@ -1917,8 +1921,8 @@ void swap(DataTransferDetails &a, DataTransferDetails &b) {
swap(a.__isset, b.__isset);
}
-const char* TaskDetails::ascii_fingerprint = "B61C8F58DF00FE6B55A62F6A457038DD";
-const uint8_t TaskDetails::binary_fingerprint[16] = {0xB6,0x1C,0x8F,0x58,0xDF,0x00,0xFE,0x6B,0x55,0xA6,0x2F,0x6A,0x45,0x70,0x38,0xDD};
+const char* TaskDetails::ascii_fingerprint = "482C560A67EC84E3BEB13AFC5FEDA02C";
+const uint8_t TaskDetails::binary_fingerprint[16] = {0x48,0x2C,0x56,0x0A,0x67,0xEC,0x84,0xE3,0xBE,0xB1,0x3A,0xFC,0x5F,0xED,0xA0,0x2C};
uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -1975,21 +1979,13 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->hostDescriptorId);
- this->__isset.hostDescriptorId = true;
+ xfer += iprot->readString(this->applicationDeploymentId);
+ this->__isset.applicationDeploymentId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 6:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->applicationDescriptorId);
- this->__isset.applicationDescriptorId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationInputs.clear();
@@ -2009,7 +2005,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationOutputs.clear();
@@ -2029,7 +2025,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->taskScheduling.read(iprot);
this->__isset.taskScheduling = true;
@@ -2037,7 +2033,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->advancedInputDataHandling.read(iprot);
this->__isset.advancedInputDataHandling = true;
@@ -2045,7 +2041,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->advancedOutputDataHandling.read(iprot);
this->__isset.advancedOutputDataHandling = true;
@@ -2053,7 +2049,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->taskStatus.read(iprot);
this->__isset.taskStatus = true;
@@ -2061,7 +2057,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->jobDetailsList.clear();
@@ -2081,7 +2077,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->dataTransferDetailsList.clear();
@@ -2101,7 +2097,7 @@ uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->errors.clear();
@@ -2158,18 +2154,13 @@ uint32_t TaskDetails::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->applicationVersion);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.hostDescriptorId) {
- xfer += oprot->writeFieldBegin("hostDescriptorId", ::apache::thrift::protocol::T_STRING, 5);
- xfer += oprot->writeString(this->hostDescriptorId);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.applicationDescriptorId) {
- xfer += oprot->writeFieldBegin("applicationDescriptorId", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->applicationDescriptorId);
+ if (this->__isset.applicationDeploymentId) {
+ xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeString(this->applicationDeploymentId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationInputs) {
- xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 7);
+ xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationInputs.size()));
std::vector<DataObjectType> ::const_iterator _iter46;
@@ -2182,7 +2173,7 @@ uint32_t TaskDetails::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.applicationOutputs) {
- xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationOutputs.size()));
std::vector<DataObjectType> ::const_iterator _iter47;
@@ -2195,27 +2186,27 @@ uint32_t TaskDetails::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.taskScheduling) {
- xfer += oprot->writeFieldBegin("taskScheduling", ::apache::thrift::protocol::T_STRUCT, 9);
+ xfer += oprot->writeFieldBegin("taskScheduling", ::apache::thrift::protocol::T_STRUCT, 8);
xfer += this->taskScheduling.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.advancedInputDataHandling) {
- xfer += oprot->writeFieldBegin("advancedInputDataHandling", ::apache::thrift::protocol::T_STRUCT, 10);
+ xfer += oprot->writeFieldBegin("advancedInputDataHandling", ::apache::thrift::protocol::T_STRUCT, 9);
xfer += this->advancedInputDataHandling.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.advancedOutputDataHandling) {
- xfer += oprot->writeFieldBegin("advancedOutputDataHandling", ::apache::thrift::protocol::T_STRUCT, 11);
+ xfer += oprot->writeFieldBegin("advancedOutputDataHandling", ::apache::thrift::protocol::T_STRUCT, 10);
xfer += this->advancedOutputDataHandling.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.taskStatus) {
- xfer += oprot->writeFieldBegin("taskStatus", ::apache::thrift::protocol::T_STRUCT, 12);
+ xfer += oprot->writeFieldBegin("taskStatus", ::apache::thrift::protocol::T_STRUCT, 11);
xfer += this->taskStatus.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.jobDetailsList) {
- xfer += oprot->writeFieldBegin("jobDetailsList", ::apache::thrift::protocol::T_LIST, 13);
+ xfer += oprot->writeFieldBegin("jobDetailsList", ::apache::thrift::protocol::T_LIST, 12);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobDetailsList.size()));
std::vector<JobDetails> ::const_iterator _iter48;
@@ -2228,7 +2219,7 @@ uint32_t TaskDetails::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.dataTransferDetailsList) {
- xfer += oprot->writeFieldBegin("dataTransferDetailsList", ::apache::thrift::protocol::T_LIST, 14);
+ xfer += oprot->writeFieldBegin("dataTransferDetailsList", ::apache::thrift::protocol::T_LIST, 13);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataTransferDetailsList.size()));
std::vector<DataTransferDetails> ::const_iterator _iter49;
@@ -2241,7 +2232,7 @@ uint32_t TaskDetails::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.errors) {
- xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 15);
+ xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 14);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->errors.size()));
std::vector<ErrorDetails> ::const_iterator _iter50;
@@ -2264,8 +2255,7 @@ void swap(TaskDetails &a, TaskDetails &b) {
swap(a.creationTime, b.creationTime);
swap(a.applicationId, b.applicationId);
swap(a.applicationVersion, b.applicationVersion);
- swap(a.hostDescriptorId, b.hostDescriptorId);
- swap(a.applicationDescriptorId, b.applicationDescriptorId);
+ swap(a.applicationDeploymentId, b.applicationDeploymentId);
swap(a.applicationInputs, b.applicationInputs);
swap(a.applicationOutputs, b.applicationOutputs);
swap(a.taskScheduling, b.taskScheduling);
@@ -2278,8 +2268,8 @@ void swap(TaskDetails &a, TaskDetails &b) {
swap(a.__isset, b.__isset);
}
-const char* WorkflowNodeDetails::ascii_fingerprint = "B9A01F97264B4D21C1929907008C6F81";
-const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0xB9,0xA0,0x1F,0x97,0x26,0x4B,0x4D,0x21,0xC1,0x92,0x99,0x07,0x00,0x8C,0x6F,0x81};
+const char* WorkflowNodeDetails::ascii_fingerprint = "95130A9D83D5C73D70BAEBDF11F2FFE7";
+const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x95,0x13,0x0A,0x9D,0x83,0xD5,0xC7,0x3D,0x70,0xBA,0xEB,0xDF,0x11,0xF2,0xFF,0xE7};
uint32_t WorkflowNodeDetails::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -2734,8 +2724,8 @@ void swap(ValidationResults &a, ValidationResults &b) {
swap(a.validationResultList, b.validationResultList);
}
-const char* Experiment::ascii_fingerprint = "2AA486482D7BE0429763612CDC85F0AE";
-const uint8_t Experiment::binary_fingerprint[16] = {0x2A,0xA4,0x86,0x48,0x2D,0x7B,0xE0,0x42,0x97,0x63,0x61,0x2C,0xDC,0x85,0xF0,0xAE};
+const char* Experiment::ascii_fingerprint = "6B1FF2298EF5AE2B9EA8F76C2DFA9E8C";
+const uint8_t Experiment::binary_fingerprint[16] = {0x6B,0x1F,0xF2,0x29,0x8E,0xF5,0xAE,0x2B,0x9E,0xA8,0xF7,0x6C,0x2D,0xFA,0x9E,0x8C};
uint32_t Experiment::read(::apache::thrift::protocol::TProtocol* iprot) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
index 52a27b9..60c0b4b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h
@@ -27,9 +27,10 @@ struct ExperimentState {
EXECUTING = 4,
CANCELING = 5,
CANCELED = 6,
- COMPLETED = 7,
- FAILED = 8,
- UNKNOWN = 9
+ SUSPENDED = 7,
+ COMPLETED = 8,
+ FAILED = 9,
+ UNKNOWN = 10
};
};
@@ -41,9 +42,10 @@ struct WorkflowNodeState {
EXECUTING = 1,
CANCELING = 2,
CANCELED = 3,
- COMPLETED = 4,
- FAILED = 5,
- UNKNOWN = 6
+ SUSPENDED = 4,
+ COMPLETED = 5,
+ FAILED = 6,
+ UNKNOWN = 7
};
};
@@ -1319,12 +1321,11 @@ class DataTransferDetails {
void swap(DataTransferDetails &a, DataTransferDetails &b);
typedef struct _TaskDetails__isset {
- _TaskDetails__isset() : creationTime(false), applicationId(false), applicationVersion(false), hostDescriptorId(false), applicationDescriptorId(false), applicationInputs(false), applicationOutputs(false), taskScheduling(false), advancedInputDataHandling(false), advancedOutputDataHandling(false), taskStatus(false), jobDetailsList(false), dataTransferDetailsList(false), errors(false) {}
+ _TaskDetails__isset() : creationTime(false), applicationId(false), applicationVersion(false), applicationDeploymentId(false), applicationInputs(false), applicationOutputs(false), taskScheduling(false), advancedInputDataHandling(false), advancedOutputDataHandling(false), taskStatus(false), jobDetailsList(false), dataTransferDetailsList(false), errors(false) {}
bool creationTime;
bool applicationId;
bool applicationVersion;
- bool hostDescriptorId;
- bool applicationDescriptorId;
+ bool applicationDeploymentId;
bool applicationInputs;
bool applicationOutputs;
bool taskScheduling;
@@ -1339,10 +1340,10 @@ typedef struct _TaskDetails__isset {
class TaskDetails {
public:
- static const char* ascii_fingerprint; // = "B61C8F58DF00FE6B55A62F6A457038DD";
- static const uint8_t binary_fingerprint[16]; // = {0xB6,0x1C,0x8F,0x58,0xDF,0x00,0xFE,0x6B,0x55,0xA6,0x2F,0x6A,0x45,0x70,0x38,0xDD};
+ static const char* ascii_fingerprint; // = "482C560A67EC84E3BEB13AFC5FEDA02C";
+ static const uint8_t binary_fingerprint[16]; // = {0x48,0x2C,0x56,0x0A,0x67,0xEC,0x84,0xE3,0xBE,0xB1,0x3A,0xFC,0x5F,0xED,0xA0,0x2C};
- TaskDetails() : taskID("DO_NOT_SET_AT_CLIENTS"), creationTime(0), applicationId(), applicationVersion(), hostDescriptorId(), applicationDescriptorId() {
+ TaskDetails() : taskID("DO_NOT_SET_AT_CLIENTS"), creationTime(0), applicationId(), applicationVersion(), applicationDeploymentId() {
}
virtual ~TaskDetails() throw() {}
@@ -1351,8 +1352,7 @@ class TaskDetails {
int64_t creationTime;
std::string applicationId;
std::string applicationVersion;
- std::string hostDescriptorId;
- std::string applicationDescriptorId;
+ std::string applicationDeploymentId;
std::vector<DataObjectType> applicationInputs;
std::vector<DataObjectType> applicationOutputs;
ComputationalResourceScheduling taskScheduling;
@@ -1384,14 +1384,9 @@ class TaskDetails {
__isset.applicationVersion = true;
}
- void __set_hostDescriptorId(const std::string& val) {
- hostDescriptorId = val;
- __isset.hostDescriptorId = true;
- }
-
- void __set_applicationDescriptorId(const std::string& val) {
- applicationDescriptorId = val;
- __isset.applicationDescriptorId = true;
+ void __set_applicationDeploymentId(const std::string& val) {
+ applicationDeploymentId = val;
+ __isset.applicationDeploymentId = true;
}
void __set_applicationInputs(const std::vector<DataObjectType> & val) {
@@ -1455,13 +1450,9 @@ class TaskDetails {
return false;
else if (__isset.applicationVersion && !(applicationVersion == rhs.applicationVersion))
return false;
- if (__isset.hostDescriptorId != rhs.__isset.hostDescriptorId)
- return false;
- else if (__isset.hostDescriptorId && !(hostDescriptorId == rhs.hostDescriptorId))
- return false;
- if (__isset.applicationDescriptorId != rhs.__isset.applicationDescriptorId)
+ if (__isset.applicationDeploymentId != rhs.__isset.applicationDeploymentId)
return false;
- else if (__isset.applicationDescriptorId && !(applicationDescriptorId == rhs.applicationDescriptorId))
+ else if (__isset.applicationDeploymentId && !(applicationDeploymentId == rhs.applicationDeploymentId))
return false;
if (__isset.applicationInputs != rhs.__isset.applicationInputs)
return false;
@@ -1528,8 +1519,8 @@ typedef struct _WorkflowNodeDetails__isset {
class WorkflowNodeDetails {
public:
- static const char* ascii_fingerprint; // = "B9A01F97264B4D21C1929907008C6F81";
- static const uint8_t binary_fingerprint[16]; // = {0xB9,0xA0,0x1F,0x97,0x26,0x4B,0x4D,0x21,0xC1,0x92,0x99,0x07,0x00,0x8C,0x6F,0x81};
+ static const char* ascii_fingerprint; // = "95130A9D83D5C73D70BAEBDF11F2FFE7";
+ static const uint8_t binary_fingerprint[16]; // = {0x95,0x13,0x0A,0x9D,0x83,0xD5,0xC7,0x3D,0x70,0xBA,0xEB,0xDF,0x11,0xF2,0xFF,0xE7};
WorkflowNodeDetails() : nodeInstanceId("DO_NOT_SET_AT_CLIENTS"), creationTime(0), nodeName("SINGLE_APP_NODE"), executionUnit((ExecutionUnit::type)1), executionUnitData() {
executionUnit = (ExecutionUnit::type)1;
@@ -1767,8 +1758,8 @@ typedef struct _Experiment__isset {
class Experiment {
public:
- static const char* ascii_fingerprint; // = "2AA486482D7BE0429763612CDC85F0AE";
- static const uint8_t binary_fingerprint[16]; // = {0x2A,0xA4,0x86,0x48,0x2D,0x7B,0xE0,0x42,0x97,0x63,0x61,0x2C,0xDC,0x85,0xF0,0xAE};
+ static const char* ascii_fingerprint; // = "6B1FF2298EF5AE2B9EA8F76C2DFA9E8C";
+ static const uint8_t binary_fingerprint[16]; // = {0x6B,0x1F,0xF2,0x29,0x8E,0xF5,0xAE,0x2B,0x9E,0xA8,0xF7,0x6C,0x2D,0xFA,0x9E,0x8C};
Experiment() : experimentID("DO_NOT_SET_AT_CLIENTS"), projectID("DEFAULT"), creationTime(0), userName(), name(), description(), applicationId(), applicationVersion(), workflowTemplateId(), workflowTemplateVersion(), workflowExecutionInstanceId() {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
index caf51e6..b5aa1ee 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php
@@ -25,9 +25,10 @@ final class ExperimentState {
const EXECUTING = 4;
const CANCELING = 5;
const CANCELED = 6;
- const COMPLETED = 7;
- const FAILED = 8;
- const UNKNOWN = 9;
+ const SUSPENDED = 7;
+ const COMPLETED = 8;
+ const FAILED = 9;
+ const UNKNOWN = 10;
static public $__names = array(
0 => 'CREATED',
1 => 'VALIDATED',
@@ -36,9 +37,10 @@ final class ExperimentState {
4 => 'EXECUTING',
5 => 'CANCELING',
6 => 'CANCELED',
- 7 => 'COMPLETED',
- 8 => 'FAILED',
- 9 => 'UNKNOWN',
+ 7 => 'SUSPENDED',
+ 8 => 'COMPLETED',
+ 9 => 'FAILED',
+ 10 => 'UNKNOWN',
);
}
@@ -47,17 +49,19 @@ final class WorkflowNodeState {
const EXECUTING = 1;
const CANCELING = 2;
const CANCELED = 3;
- const COMPLETED = 4;
- const FAILED = 5;
- const UNKNOWN = 6;
+ const SUSPENDED = 4;
+ const COMPLETED = 5;
+ const FAILED = 6;
+ const UNKNOWN = 7;
static public $__names = array(
0 => 'INVOKED',
1 => 'EXECUTING',
2 => 'CANCELING',
3 => 'CANCELED',
- 4 => 'COMPLETED',
- 5 => 'FAILED',
- 6 => 'UNKNOWN',
+ 4 => 'SUSPENDED',
+ 5 => 'COMPLETED',
+ 6 => 'FAILED',
+ 7 => 'UNKNOWN',
);
}
@@ -2341,8 +2345,7 @@ class TaskDetails {
public $creationTime = null;
public $applicationId = null;
public $applicationVersion = null;
- public $hostDescriptorId = null;
- public $applicationDescriptorId = null;
+ public $applicationDeploymentId = null;
public $applicationInputs = null;
public $applicationOutputs = null;
public $taskScheduling = null;
@@ -2373,14 +2376,10 @@ class TaskDetails {
'type' => TType::STRING,
),
5 => array(
- 'var' => 'hostDescriptorId',
+ 'var' => 'applicationDeploymentId',
'type' => TType::STRING,
),
6 => array(
- 'var' => 'applicationDescriptorId',
- 'type' => TType::STRING,
- ),
- 7 => array(
'var' => 'applicationInputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -2389,7 +2388,7 @@ class TaskDetails {
'class' => '\Airavata\Model\Workspace\Experiment\DataObjectType',
),
),
- 8 => array(
+ 7 => array(
'var' => 'applicationOutputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -2398,27 +2397,27 @@ class TaskDetails {
'class' => '\Airavata\Model\Workspace\Experiment\DataObjectType',
),
),
- 9 => array(
+ 8 => array(
'var' => 'taskScheduling',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling',
),
- 10 => array(
+ 9 => array(
'var' => 'advancedInputDataHandling',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Experiment\AdvancedInputDataHandling',
),
- 11 => array(
+ 10 => array(
'var' => 'advancedOutputDataHandling',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Experiment\AdvancedOutputDataHandling',
),
- 12 => array(
+ 11 => array(
'var' => 'taskStatus',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Experiment\TaskStatus',
),
- 13 => array(
+ 12 => array(
'var' => 'jobDetailsList',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -2427,7 +2426,7 @@ class TaskDetails {
'class' => '\Airavata\Model\Workspace\Experiment\JobDetails',
),
),
- 14 => array(
+ 13 => array(
'var' => 'dataTransferDetailsList',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -2436,7 +2435,7 @@ class TaskDetails {
'class' => '\Airavata\Model\Workspace\Experiment\DataTransferDetails',
),
),
- 15 => array(
+ 14 => array(
'var' => 'errors',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -2460,11 +2459,8 @@ class TaskDetails {
if (isset($vals['applicationVersion'])) {
$this->applicationVersion = $vals['applicationVersion'];
}
- if (isset($vals['hostDescriptorId'])) {
- $this->hostDescriptorId = $vals['hostDescriptorId'];
- }
- if (isset($vals['applicationDescriptorId'])) {
- $this->applicationDescriptorId = $vals['applicationDescriptorId'];
+ if (isset($vals['applicationDeploymentId'])) {
+ $this->applicationDeploymentId = $vals['applicationDeploymentId'];
}
if (isset($vals['applicationInputs'])) {
$this->applicationInputs = $vals['applicationInputs'];
@@ -2545,19 +2541,12 @@ class TaskDetails {
break;
case 5:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->hostDescriptorId);
+ $xfer += $input->readString($this->applicationDeploymentId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->applicationDescriptorId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
if ($ftype == TType::LST) {
$this->applicationInputs = array();
$_size14 = 0;
@@ -2575,7 +2564,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::LST) {
$this->applicationOutputs = array();
$_size20 = 0;
@@ -2593,7 +2582,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::STRUCT) {
$this->taskScheduling = new \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling();
$xfer += $this->taskScheduling->read($input);
@@ -2601,7 +2590,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::STRUCT) {
$this->advancedInputDataHandling = new \Airavata\Model\Workspace\Experiment\AdvancedInputDataHandling();
$xfer += $this->advancedInputDataHandling->read($input);
@@ -2609,7 +2598,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::STRUCT) {
$this->advancedOutputDataHandling = new \Airavata\Model\Workspace\Experiment\AdvancedOutputDataHandling();
$xfer += $this->advancedOutputDataHandling->read($input);
@@ -2617,7 +2606,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 11:
if ($ftype == TType::STRUCT) {
$this->taskStatus = new \Airavata\Model\Workspace\Experiment\TaskStatus();
$xfer += $this->taskStatus->read($input);
@@ -2625,7 +2614,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::LST) {
$this->jobDetailsList = array();
$_size26 = 0;
@@ -2643,7 +2632,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 13:
if ($ftype == TType::LST) {
$this->dataTransferDetailsList = array();
$_size32 = 0;
@@ -2661,7 +2650,7 @@ class TaskDetails {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 14:
if ($ftype == TType::LST) {
$this->errors = array();
$_size38 = 0;
@@ -2712,21 +2701,16 @@ class TaskDetails {
$xfer += $output->writeString($this->applicationVersion);
$xfer += $output->writeFieldEnd();
}
- if ($this->hostDescriptorId !== null) {
- $xfer += $output->writeFieldBegin('hostDescriptorId', TType::STRING, 5);
- $xfer += $output->writeString($this->hostDescriptorId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->applicationDescriptorId !== null) {
- $xfer += $output->writeFieldBegin('applicationDescriptorId', TType::STRING, 6);
- $xfer += $output->writeString($this->applicationDescriptorId);
+ if ($this->applicationDeploymentId !== null) {
+ $xfer += $output->writeFieldBegin('applicationDeploymentId', TType::STRING, 5);
+ $xfer += $output->writeString($this->applicationDeploymentId);
$xfer += $output->writeFieldEnd();
}
if ($this->applicationInputs !== null) {
if (!is_array($this->applicationInputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 6);
{
$output->writeListBegin(TType::STRUCT, count($this->applicationInputs));
{
@@ -2743,7 +2727,7 @@ class TaskDetails {
if (!is_array($this->applicationOutputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 7);
{
$output->writeListBegin(TType::STRUCT, count($this->applicationOutputs));
{
@@ -2760,7 +2744,7 @@ class TaskDetails {
if (!is_object($this->taskScheduling)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('taskScheduling', TType::STRUCT, 9);
+ $xfer += $output->writeFieldBegin('taskScheduling', TType::STRUCT, 8);
$xfer += $this->taskScheduling->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -2768,7 +2752,7 @@ class TaskDetails {
if (!is_object($this->advancedInputDataHandling)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('advancedInputDataHandling', TType::STRUCT, 10);
+ $xfer += $output->writeFieldBegin('advancedInputDataHandling', TType::STRUCT, 9);
$xfer += $this->advancedInputDataHandling->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -2776,7 +2760,7 @@ class TaskDetails {
if (!is_object($this->advancedOutputDataHandling)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('advancedOutputDataHandling', TType::STRUCT, 11);
+ $xfer += $output->writeFieldBegin('advancedOutputDataHandling', TType::STRUCT, 10);
$xfer += $this->advancedOutputDataHandling->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -2784,7 +2768,7 @@ class TaskDetails {
if (!is_object($this->taskStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('taskStatus', TType::STRUCT, 12);
+ $xfer += $output->writeFieldBegin('taskStatus', TType::STRUCT, 11);
$xfer += $this->taskStatus->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -2792,7 +2776,7 @@ class TaskDetails {
if (!is_array($this->jobDetailsList)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('jobDetailsList', TType::LST, 13);
+ $xfer += $output->writeFieldBegin('jobDetailsList', TType::LST, 12);
{
$output->writeListBegin(TType::STRUCT, count($this->jobDetailsList));
{
@@ -2809,7 +2793,7 @@ class TaskDetails {
if (!is_array($this->dataTransferDetailsList)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataTransferDetailsList', TType::LST, 14);
+ $xfer += $output->writeFieldBegin('dataTransferDetailsList', TType::LST, 13);
{
$output->writeListBegin(TType::STRUCT, count($this->dataTransferDetailsList));
{
@@ -2826,7 +2810,7 @@ class TaskDetails {
if (!is_array($this->errors)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('errors', TType::LST, 15);
+ $xfer += $output->writeFieldBegin('errors', TType::LST, 14);
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java
index 4b8a217..9d4c42a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ExperimentState.java
@@ -35,9 +35,10 @@ import org.apache.thrift.TEnum;
EXECUTING(4),
CANCELING(5),
CANCELED(6),
- COMPLETED(7),
- FAILED(8),
- UNKNOWN(9);
+ SUSPENDED(7),
+ COMPLETED(8),
+ FAILED(9),
+ UNKNOWN(10);
private final int value;
@@ -73,10 +74,12 @@ import org.apache.thrift.TEnum;
case 6:
return CANCELED;
case 7:
- return COMPLETED;
+ return SUSPENDED;
case 8:
- return FAILED;
+ return COMPLETED;
case 9:
+ return FAILED;
+ case 10:
return UNKNOWN;
default:
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java
index 14fee11..e9fa3b1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/TaskDetails.java
@@ -61,17 +61,16 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("creationTime", org.apache.thrift.protocol.TType.I64, (short)2);
private static final org.apache.thrift.protocol.TField APPLICATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField APPLICATION_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationVersion", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final org.apache.thrift.protocol.TField HOST_DESCRIPTOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("hostDescriptorId", org.apache.thrift.protocol.TType.STRING, (short)5);
- private static final org.apache.thrift.protocol.TField APPLICATION_DESCRIPTOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDescriptorId", org.apache.thrift.protocol.TType.STRING, (short)6);
- private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)7);
- private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)8);
- private static final org.apache.thrift.protocol.TField TASK_SCHEDULING_FIELD_DESC = new org.apache.thrift.protocol.TField("taskScheduling", org.apache.thrift.protocol.TType.STRUCT, (short)9);
- private static final org.apache.thrift.protocol.TField ADVANCED_INPUT_DATA_HANDLING_FIELD_DESC = new org.apache.thrift.protocol.TField("advancedInputDataHandling", org.apache.thrift.protocol.TType.STRUCT, (short)10);
- private static final org.apache.thrift.protocol.TField ADVANCED_OUTPUT_DATA_HANDLING_FIELD_DESC = new org.apache.thrift.protocol.TField("advancedOutputDataHandling", org.apache.thrift.protocol.TType.STRUCT, (short)11);
- private static final org.apache.thrift.protocol.TField TASK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskStatus", org.apache.thrift.protocol.TType.STRUCT, (short)12);
- private static final org.apache.thrift.protocol.TField JOB_DETAILS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDetailsList", org.apache.thrift.protocol.TType.LIST, (short)13);
- private static final org.apache.thrift.protocol.TField DATA_TRANSFER_DETAILS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataTransferDetailsList", org.apache.thrift.protocol.TType.LIST, (short)14);
- 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)15);
+ private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)6);
+ private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)7);
+ private static final org.apache.thrift.protocol.TField TASK_SCHEDULING_FIELD_DESC = new org.apache.thrift.protocol.TField("taskScheduling", org.apache.thrift.protocol.TType.STRUCT, (short)8);
+ private static final org.apache.thrift.protocol.TField ADVANCED_INPUT_DATA_HANDLING_FIELD_DESC = new org.apache.thrift.protocol.TField("advancedInputDataHandling", org.apache.thrift.protocol.TType.STRUCT, (short)9);
+ private static final org.apache.thrift.protocol.TField ADVANCED_OUTPUT_DATA_HANDLING_FIELD_DESC = new org.apache.thrift.protocol.TField("advancedOutputDataHandling", org.apache.thrift.protocol.TType.STRUCT, (short)10);
+ private static final org.apache.thrift.protocol.TField TASK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskStatus", org.apache.thrift.protocol.TType.STRUCT, (short)11);
+ private static final org.apache.thrift.protocol.TField JOB_DETAILS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDetailsList", org.apache.thrift.protocol.TType.LIST, (short)12);
+ private static final org.apache.thrift.protocol.TField DATA_TRANSFER_DETAILS_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataTransferDetailsList", org.apache.thrift.protocol.TType.LIST, (short)13);
+ 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)14);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -83,8 +82,7 @@ import org.slf4j.LoggerFactory;
private long creationTime; // optional
private String applicationId; // optional
private String applicationVersion; // optional
- private String hostDescriptorId; // optional
- private String applicationDescriptorId; // optional
+ private String applicationDeploymentId; // optional
private List<DataObjectType> applicationInputs; // optional
private List<DataObjectType> applicationOutputs; // optional
private ComputationalResourceScheduling taskScheduling; // optional
@@ -101,17 +99,16 @@ import org.slf4j.LoggerFactory;
CREATION_TIME((short)2, "creationTime"),
APPLICATION_ID((short)3, "applicationId"),
APPLICATION_VERSION((short)4, "applicationVersion"),
- HOST_DESCRIPTOR_ID((short)5, "hostDescriptorId"),
- APPLICATION_DESCRIPTOR_ID((short)6, "applicationDescriptorId"),
- APPLICATION_INPUTS((short)7, "applicationInputs"),
- APPLICATION_OUTPUTS((short)8, "applicationOutputs"),
- TASK_SCHEDULING((short)9, "taskScheduling"),
- ADVANCED_INPUT_DATA_HANDLING((short)10, "advancedInputDataHandling"),
- ADVANCED_OUTPUT_DATA_HANDLING((short)11, "advancedOutputDataHandling"),
- TASK_STATUS((short)12, "taskStatus"),
- JOB_DETAILS_LIST((short)13, "jobDetailsList"),
- DATA_TRANSFER_DETAILS_LIST((short)14, "dataTransferDetailsList"),
- ERRORS((short)15, "errors");
+ APPLICATION_DEPLOYMENT_ID((short)5, "applicationDeploymentId"),
+ APPLICATION_INPUTS((short)6, "applicationInputs"),
+ APPLICATION_OUTPUTS((short)7, "applicationOutputs"),
+ TASK_SCHEDULING((short)8, "taskScheduling"),
+ ADVANCED_INPUT_DATA_HANDLING((short)9, "advancedInputDataHandling"),
+ ADVANCED_OUTPUT_DATA_HANDLING((short)10, "advancedOutputDataHandling"),
+ TASK_STATUS((short)11, "taskStatus"),
+ JOB_DETAILS_LIST((short)12, "jobDetailsList"),
+ DATA_TRANSFER_DETAILS_LIST((short)13, "dataTransferDetailsList"),
+ ERRORS((short)14, "errors");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -134,27 +131,25 @@ import org.slf4j.LoggerFactory;
return APPLICATION_ID;
case 4: // APPLICATION_VERSION
return APPLICATION_VERSION;
- case 5: // HOST_DESCRIPTOR_ID
- return HOST_DESCRIPTOR_ID;
- case 6: // APPLICATION_DESCRIPTOR_ID
- return APPLICATION_DESCRIPTOR_ID;
- case 7: // APPLICATION_INPUTS
+ case 5: // APPLICATION_DEPLOYMENT_ID
+ return APPLICATION_DEPLOYMENT_ID;
+ case 6: // APPLICATION_INPUTS
return APPLICATION_INPUTS;
- case 8: // APPLICATION_OUTPUTS
+ case 7: // APPLICATION_OUTPUTS
return APPLICATION_OUTPUTS;
- case 9: // TASK_SCHEDULING
+ case 8: // TASK_SCHEDULING
return TASK_SCHEDULING;
- case 10: // ADVANCED_INPUT_DATA_HANDLING
+ case 9: // ADVANCED_INPUT_DATA_HANDLING
return ADVANCED_INPUT_DATA_HANDLING;
- case 11: // ADVANCED_OUTPUT_DATA_HANDLING
+ case 10: // ADVANCED_OUTPUT_DATA_HANDLING
return ADVANCED_OUTPUT_DATA_HANDLING;
- case 12: // TASK_STATUS
+ case 11: // TASK_STATUS
return TASK_STATUS;
- case 13: // JOB_DETAILS_LIST
+ case 12: // JOB_DETAILS_LIST
return JOB_DETAILS_LIST;
- case 14: // DATA_TRANSFER_DETAILS_LIST
+ case 13: // DATA_TRANSFER_DETAILS_LIST
return DATA_TRANSFER_DETAILS_LIST;
- case 15: // ERRORS
+ case 14: // ERRORS
return ERRORS;
default:
return null;
@@ -198,7 +193,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __CREATIONTIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.APPLICATION_ID,_Fields.APPLICATION_VERSION,_Fields.HOST_DESCRIPTOR_ID,_Fields.APPLICATION_DESCRIPTOR_ID,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.TASK_SCHEDULING,_Fields.ADVANCED_INPUT_DATA_HANDLING,_Fields.ADVANCED_OUTPUT_DATA_HANDLING,_Fields.TASK_STATUS,_Fields.JOB_DETAILS_LIST,_Fields.DATA_TRANSFER_DETAILS_LIST,_Fields.ERRORS};
+ private _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.APPLICATION_ID,_Fields.APPLICATION_VERSION,_Fields.APPLICATION_DEPLOYMENT_ID,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS,_Fields.TASK_SCHEDULING,_Fields.ADVANCED_INPUT_DATA_HANDLING,_Fields.ADVANCED_OUTPUT_DATA_HANDLING,_Fields.TASK_STATUS,_Fields.JOB_DETAILS_LIST,_Fields.DATA_TRANSFER_DETAILS_LIST,_Fields.ERRORS};
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);
@@ -210,9 +205,7 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APPLICATION_VERSION, new org.apache.thrift.meta_data.FieldMetaData("applicationVersion", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.HOST_DESCRIPTOR_ID, new org.apache.thrift.meta_data.FieldMetaData("hostDescriptorId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.APPLICATION_DESCRIPTOR_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationDescriptorId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.APPLICATION_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationDeploymentId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APPLICATION_INPUTS, new org.apache.thrift.meta_data.FieldMetaData("applicationInputs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
@@ -268,11 +261,8 @@ import org.slf4j.LoggerFactory;
if (other.isSetApplicationVersion()) {
this.applicationVersion = other.applicationVersion;
}
- if (other.isSetHostDescriptorId()) {
- this.hostDescriptorId = other.hostDescriptorId;
- }
- if (other.isSetApplicationDescriptorId()) {
- this.applicationDescriptorId = other.applicationDescriptorId;
+ if (other.isSetApplicationDeploymentId()) {
+ this.applicationDeploymentId = other.applicationDeploymentId;
}
if (other.isSetApplicationInputs()) {
List<DataObjectType> __this__applicationInputs = new ArrayList<DataObjectType>(other.applicationInputs.size());
@@ -335,8 +325,7 @@ import org.slf4j.LoggerFactory;
this.creationTime = 0;
this.applicationId = null;
this.applicationVersion = null;
- this.hostDescriptorId = null;
- this.applicationDescriptorId = null;
+ this.applicationDeploymentId = null;
this.applicationInputs = null;
this.applicationOutputs = null;
this.taskScheduling = null;
@@ -439,49 +428,26 @@ import org.slf4j.LoggerFactory;
}
}
- public String getHostDescriptorId() {
- return this.hostDescriptorId;
+ public String getApplicationDeploymentId() {
+ return this.applicationDeploymentId;
}
- public void setHostDescriptorId(String hostDescriptorId) {
- this.hostDescriptorId = hostDescriptorId;
+ public void setApplicationDeploymentId(String applicationDeploymentId) {
+ this.applicationDeploymentId = applicationDeploymentId;
}
- public void unsetHostDescriptorId() {
- this.hostDescriptorId = null;
+ public void unsetApplicationDeploymentId() {
+ this.applicationDeploymentId = null;
}
- /** Returns true if field hostDescriptorId is set (has been assigned a value) and false otherwise */
- public boolean isSetHostDescriptorId() {
- return this.hostDescriptorId != null;
+ /** Returns true if field applicationDeploymentId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationDeploymentId() {
+ return this.applicationDeploymentId != null;
}
- public void setHostDescriptorIdIsSet(boolean value) {
+ public void setApplicationDeploymentIdIsSet(boolean value) {
if (!value) {
- this.hostDescriptorId = null;
- }
- }
-
- public String getApplicationDescriptorId() {
- return this.applicationDescriptorId;
- }
-
- public void setApplicationDescriptorId(String applicationDescriptorId) {
- this.applicationDescriptorId = applicationDescriptorId;
- }
-
- public void unsetApplicationDescriptorId() {
- this.applicationDescriptorId = null;
- }
-
- /** Returns true if field applicationDescriptorId is set (has been assigned a value) and false otherwise */
- public boolean isSetApplicationDescriptorId() {
- return this.applicationDescriptorId != null;
- }
-
- public void setApplicationDescriptorIdIsSet(boolean value) {
- if (!value) {
- this.applicationDescriptorId = null;
+ this.applicationDeploymentId = null;
}
}
@@ -801,19 +767,11 @@ import org.slf4j.LoggerFactory;
}
break;
- case HOST_DESCRIPTOR_ID:
- if (value == null) {
- unsetHostDescriptorId();
- } else {
- setHostDescriptorId((String)value);
- }
- break;
-
- case APPLICATION_DESCRIPTOR_ID:
+ case APPLICATION_DEPLOYMENT_ID:
if (value == null) {
- unsetApplicationDescriptorId();
+ unsetApplicationDeploymentId();
} else {
- setApplicationDescriptorId((String)value);
+ setApplicationDeploymentId((String)value);
}
break;
@@ -906,11 +864,8 @@ import org.slf4j.LoggerFactory;
case APPLICATION_VERSION:
return getApplicationVersion();
- case HOST_DESCRIPTOR_ID:
- return getHostDescriptorId();
-
- case APPLICATION_DESCRIPTOR_ID:
- return getApplicationDescriptorId();
+ case APPLICATION_DEPLOYMENT_ID:
+ return getApplicationDeploymentId();
case APPLICATION_INPUTS:
return getApplicationInputs();
@@ -958,10 +913,8 @@ import org.slf4j.LoggerFactory;
return isSetApplicationId();
case APPLICATION_VERSION:
return isSetApplicationVersion();
- case HOST_DESCRIPTOR_ID:
- return isSetHostDescriptorId();
- case APPLICATION_DESCRIPTOR_ID:
- return isSetApplicationDescriptorId();
+ case APPLICATION_DEPLOYMENT_ID:
+ return isSetApplicationDeploymentId();
case APPLICATION_INPUTS:
return isSetApplicationInputs();
case APPLICATION_OUTPUTS:
@@ -1033,21 +986,12 @@ import org.slf4j.LoggerFactory;
return false;
}
- boolean this_present_hostDescriptorId = true && this.isSetHostDescriptorId();
- boolean that_present_hostDescriptorId = true && that.isSetHostDescriptorId();
- if (this_present_hostDescriptorId || that_present_hostDescriptorId) {
- if (!(this_present_hostDescriptorId && that_present_hostDescriptorId))
+ boolean this_present_applicationDeploymentId = true && this.isSetApplicationDeploymentId();
+ boolean that_present_applicationDeploymentId = true && that.isSetApplicationDeploymentId();
+ if (this_present_applicationDeploymentId || that_present_applicationDeploymentId) {
+ if (!(this_present_applicationDeploymentId && that_present_applicationDeploymentId))
return false;
- if (!this.hostDescriptorId.equals(that.hostDescriptorId))
- return false;
- }
-
- boolean this_present_applicationDescriptorId = true && this.isSetApplicationDescriptorId();
- boolean that_present_applicationDescriptorId = true && that.isSetApplicationDescriptorId();
- if (this_present_applicationDescriptorId || that_present_applicationDescriptorId) {
- if (!(this_present_applicationDescriptorId && that_present_applicationDescriptorId))
- return false;
- if (!this.applicationDescriptorId.equals(that.applicationDescriptorId))
+ if (!this.applicationDeploymentId.equals(that.applicationDeploymentId))
return false;
}
@@ -1188,22 +1132,12 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetHostDescriptorId()).compareTo(other.isSetHostDescriptorId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetHostDescriptorId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostDescriptorId, other.hostDescriptorId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetApplicationDescriptorId()).compareTo(other.isSetApplicationDescriptorId());
+ lastComparison = Boolean.valueOf(isSetApplicationDeploymentId()).compareTo(other.isSetApplicationDeploymentId());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetApplicationDescriptorId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDescriptorId, other.applicationDescriptorId);
+ if (isSetApplicationDeploymentId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationDeploymentId, other.applicationDeploymentId);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1351,23 +1285,13 @@ import org.slf4j.LoggerFactory;
}
first = false;
}
- if (isSetHostDescriptorId()) {
+ if (isSetApplicationDeploymentId()) {
if (!first) sb.append(", ");
- sb.append("hostDescriptorId:");
- if (this.hostDescriptorId == null) {
+ sb.append("applicationDeploymentId:");
+ if (this.applicationDeploymentId == null) {
sb.append("null");
} else {
- sb.append(this.hostDescriptorId);
- }
- first = false;
- }
- if (isSetApplicationDescriptorId()) {
- if (!first) sb.append(", ");
- sb.append("applicationDescriptorId:");
- if (this.applicationDescriptorId == null) {
- sb.append("null");
- } else {
- sb.append(this.applicationDescriptorId);
+ sb.append(this.applicationDeploymentId);
}
first = false;
}
@@ -1554,23 +1478,15 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // HOST_DESCRIPTOR_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.hostDescriptorId = iprot.readString();
- struct.setHostDescriptorIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 6: // APPLICATION_DESCRIPTOR_ID
+ case 5: // APPLICATION_DEPLOYMENT_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.applicationDescriptorId = iprot.readString();
- struct.setApplicationDescriptorIdIsSet(true);
+ struct.applicationDeploymentId = iprot.readString();
+ struct.setApplicationDeploymentIdIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // APPLICATION_INPUTS
+ case 6: // APPLICATION_INPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
@@ -1589,7 +1505,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // APPLICATION_OUTPUTS
+ case 7: // APPLICATION_OUTPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list19 = iprot.readListBegin();
@@ -1608,7 +1524,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // TASK_SCHEDULING
+ case 8: // TASK_SCHEDULING
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.taskScheduling = new ComputationalResourceScheduling();
struct.taskScheduling.read(iprot);
@@ -1617,7 +1533,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // ADVANCED_INPUT_DATA_HANDLING
+ case 9: // ADVANCED_INPUT_DATA_HANDLING
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.advancedInputDataHandling = new AdvancedInputDataHandling();
struct.advancedInputDataHandling.read(iprot);
@@ -1626,7 +1542,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // ADVANCED_OUTPUT_DATA_HANDLING
+ case 10: // ADVANCED_OUTPUT_DATA_HANDLING
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.advancedOutputDataHandling = new AdvancedOutputDataHandling();
struct.advancedOutputDataHandling.read(iprot);
@@ -1635,7 +1551,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // TASK_STATUS
+ case 11: // TASK_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.taskStatus = new TaskStatus();
struct.taskStatus.read(iprot);
@@ -1644,7 +1560,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // JOB_DETAILS_LIST
+ case 12: // JOB_DETAILS_LIST
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
@@ -1663,7 +1579,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 14: // DATA_TRANSFER_DETAILS_LIST
+ case 13: // DATA_TRANSFER_DETAILS_LIST
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list25 = iprot.readListBegin();
@@ -1682,7 +1598,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 15: // ERRORS
+ case 14: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
@@ -1738,17 +1654,10 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldEnd();
}
}
- if (struct.hostDescriptorId != null) {
- if (struct.isSetHostDescriptorId()) {
- oprot.writeFieldBegin(HOST_DESCRIPTOR_ID_FIELD_DESC);
- oprot.writeString(struct.hostDescriptorId);
- oprot.writeFieldEnd();
- }
- }
- if (struct.applicationDescriptorId != null) {
- if (struct.isSetApplicationDescriptorId()) {
- oprot.writeFieldBegin(APPLICATION_DESCRIPTOR_ID_FIELD_DESC);
- oprot.writeString(struct.applicationDescriptorId);
+ if (struct.applicationDeploymentId != null) {
+ if (struct.isSetApplicationDeploymentId()) {
+ oprot.writeFieldBegin(APPLICATION_DEPLOYMENT_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationDeploymentId);
oprot.writeFieldEnd();
}
}
@@ -1878,40 +1787,37 @@ import org.slf4j.LoggerFactory;
if (struct.isSetApplicationVersion()) {
optionals.set(2);
}
- if (struct.isSetHostDescriptorId()) {
+ if (struct.isSetApplicationDeploymentId()) {
optionals.set(3);
}
- if (struct.isSetApplicationDescriptorId()) {
- optionals.set(4);
- }
if (struct.isSetApplicationInputs()) {
- optionals.set(5);
+ optionals.set(4);
}
if (struct.isSetApplicationOutputs()) {
- optionals.set(6);
+ optionals.set(5);
}
if (struct.isSetTaskScheduling()) {
- optionals.set(7);
+ optionals.set(6);
}
if (struct.isSetAdvancedInputDataHandling()) {
- optionals.set(8);
+ optionals.set(7);
}
if (struct.isSetAdvancedOutputDataHandling()) {
- optionals.set(9);
+ optionals.set(8);
}
if (struct.isSetTaskStatus()) {
- optionals.set(10);
+ optionals.set(9);
}
if (struct.isSetJobDetailsList()) {
- optionals.set(11);
+ optionals.set(10);
}
if (struct.isSetDataTransferDetailsList()) {
- optionals.set(12);
+ optionals.set(11);
}
if (struct.isSetErrors()) {
- optionals.set(13);
+ optionals.set(12);
}
- oprot.writeBitSet(optionals, 14);
+ oprot.writeBitSet(optionals, 13);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -1921,11 +1827,8 @@ import org.slf4j.LoggerFactory;
if (struct.isSetApplicationVersion()) {
oprot.writeString(struct.applicationVersion);
}
- if (struct.isSetHostDescriptorId()) {
- oprot.writeString(struct.hostDescriptorId);
- }
- if (struct.isSetApplicationDescriptorId()) {
- oprot.writeString(struct.applicationDescriptorId);
+ if (struct.isSetApplicationDeploymentId()) {
+ oprot.writeString(struct.applicationDeploymentId);
}
if (struct.isSetApplicationInputs()) {
{
@@ -1991,7 +1894,7 @@ import org.slf4j.LoggerFactory;
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.taskID = iprot.readString();
struct.setTaskIDIsSet(true);
- BitSet incoming = iprot.readBitSet(14);
+ BitSet incoming = iprot.readBitSet(13);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -2005,14 +1908,10 @@ import org.slf4j.LoggerFactory;
struct.setApplicationVersionIsSet(true);
}
if (incoming.get(3)) {
- struct.hostDescriptorId = iprot.readString();
- struct.setHostDescriptorIdIsSet(true);
+ struct.applicationDeploymentId = iprot.readString();
+ struct.setApplicationDeploymentIdIsSet(true);
}
if (incoming.get(4)) {
- struct.applicationDescriptorId = iprot.readString();
- struct.setApplicationDescriptorIdIsSet(true);
- }
- if (incoming.get(5)) {
{
org.apache.thrift.protocol.TList _list41 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.applicationInputs = new ArrayList<DataObjectType>(_list41.size);
@@ -2026,7 +1925,7 @@ import org.slf4j.LoggerFactory;
}
struct.setApplicationInputsIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(5)) {
{
org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.applicationOutputs = new ArrayList<DataObjectType>(_list44.size);
@@ -2040,27 +1939,27 @@ import org.slf4j.LoggerFactory;
}
struct.setApplicationOutputsIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(6)) {
struct.taskScheduling = new ComputationalResourceScheduling();
struct.taskScheduling.read(iprot);
struct.setTaskSchedulingIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(7)) {
struct.advancedInputDataHandling = new AdvancedInputDataHandling();
struct.advancedInputDataHandling.read(iprot);
struct.setAdvancedInputDataHandlingIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(8)) {
struct.advancedOutputDataHandling = new AdvancedOutputDataHandling();
struct.advancedOutputDataHandling.read(iprot);
struct.setAdvancedOutputDataHandlingIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(9)) {
struct.taskStatus = new TaskStatus();
struct.taskStatus.read(iprot);
struct.setTaskStatusIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(10)) {
{
org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.jobDetailsList = new ArrayList<JobDetails>(_list47.size);
@@ -2074,7 +1973,7 @@ import org.slf4j.LoggerFactory;
}
struct.setJobDetailsListIsSet(true);
}
- if (incoming.get(12)) {
+ if (incoming.get(11)) {
{
org.apache.thrift.protocol.TList _list50 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.dataTransferDetailsList = new ArrayList<DataTransferDetails>(_list50.size);
@@ -2088,7 +1987,7 @@ import org.slf4j.LoggerFactory;
}
struct.setDataTransferDetailsListIsSet(true);
}
- if (incoming.get(13)) {
+ if (incoming.get(12)) {
{
org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.errors = new ArrayList<ErrorDetails>(_list53.size);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c60ba81c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java
index 4a23872..dcd53e2 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/WorkflowNodeState.java
@@ -32,9 +32,10 @@ import org.apache.thrift.TEnum;
EXECUTING(1),
CANCELING(2),
CANCELED(3),
- COMPLETED(4),
- FAILED(5),
- UNKNOWN(6);
+ SUSPENDED(4),
+ COMPLETED(5),
+ FAILED(6),
+ UNKNOWN(7);
private final int value;
@@ -64,10 +65,12 @@ import org.apache.thrift.TEnum;
case 3:
return CANCELED;
case 4:
- return COMPLETED;
+ return SUSPENDED;
case 5:
- return FAILED;
+ return COMPLETED;
case 6:
+ return FAILED;
+ case 7:
return UNKNOWN;
default:
return null;