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/06/23 23:41:23 UTC
[01/14] airavata git commit: updating experiment model and experiment
summary model
Repository: airavata
Updated Branches:
refs/heads/master 013e8c090 -> a2dce4f8c
updating experiment model and experiment summary model
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0dfd5a44
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0dfd5a44
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0dfd5a44
Branch: refs/heads/master
Commit: 0dfd5a443152cf97417063842f61dbd38d270c26
Parents: 9ee0df7
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 23 22:21:19 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 23 22:21:19 2015 +0530
----------------------------------------------------------------------
.../airavata-api/experiment_model.thrift | 43 +++++++++++---------
1 file changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0dfd5a44/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 b70429d..016d163 100644
--- a/thrift-interface-descriptions/airavata-api/experiment_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/experiment_model.thrift
@@ -76,31 +76,34 @@ struct UserConfigurationDataModel {
struct ExperimentModel {
1: required string experimentId,
2: required string projectId,
- 3: required ExperimentType experimentType = ExperimentType.SINGLE_APPLICATION;
- 4: required string userName,
- 5: required string experimentName,
- 6: optional i64 creationTime,
- 7: optional string description,
- 8: optional string executionId,
- 9: optional string gatewayExecutionId,
- 10: optional bool enableEmailNotification,
- 11: optional list<string> emailAddresses,
- 12: optional UserConfigurationDataModel userConfigurationData,
- 13: optional list<application_io_models.InputDataObjectType> experimentInputs,
- 14: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
- 15: optional status_models.ExperimentStatus experimentStatus,
- 16: optional list<airavata_commons.ErrorModel> errors
+ 3: required string gatewayId
+ 4: required ExperimentType experimentType = ExperimentType.SINGLE_APPLICATION;
+ 5: required string userName,
+ 6: required string experimentName,
+ 7: optional i64 creationTime,
+ 8: optional string description,
+ 9: optional string executionId,
+ 10: optional string gatewayExecutionId,
+ 11: optional bool enableEmailNotification,
+ 12: optional list<string> emailAddresses,
+ 13: optional UserConfigurationDataModel userConfigurationData,
+ 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
}
struct ExperimentSummaryModel {
1: required string experimentId,
2: required string projectId,
- 3: optional i64 creationTime,
- 4: required string userName,
- 5: required string name,
- 6: optional string description,
- 7: optional string applicationId,
- 8: optional status_models.ExperimentStatus experimentStatus,
+ 3: required string gatewayId,
+ 4: optional i64 creationTime,
+ 5: required string userName,
+ 6: required string name,
+ 7: optional string description,
+ 8: optional string executionId,
+ 9: optional string experimentStatus,
+ 10: optional i64 statusUpdateTime
}
struct ExperimentStatistics {
[10/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 824bb7c..8ae2a78 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
@@ -5876,7 +5876,7 @@ uint32_t Airavata_searchExperimentsByName_result::write(::apache::thrift::protoc
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter97;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter97;
for (_iter97 = this->success.begin(); _iter97 != this->success.end(); ++_iter97)
{
xfer += (*_iter97).write(oprot);
@@ -6233,7 +6233,7 @@ uint32_t Airavata_searchExperimentsByNameWithPagination_result::write(::apache::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter108;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter108;
for (_iter108 = this->success.begin(); _iter108 != this->success.end(); ++_iter108)
{
xfer += (*_iter108).write(oprot);
@@ -6552,7 +6552,7 @@ uint32_t Airavata_searchExperimentsByDesc_result::write(::apache::thrift::protoc
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter119;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter119;
for (_iter119 = this->success.begin(); _iter119 != this->success.end(); ++_iter119)
{
xfer += (*_iter119).write(oprot);
@@ -6909,7 +6909,7 @@ uint32_t Airavata_searchExperimentsByDescWithPagination_result::write(::apache::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter130;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter130;
for (_iter130 = this->success.begin(); _iter130 != this->success.end(); ++_iter130)
{
xfer += (*_iter130).write(oprot);
@@ -7228,7 +7228,7 @@ uint32_t Airavata_searchExperimentsByApplication_result::write(::apache::thrift:
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter141;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter141;
for (_iter141 = this->success.begin(); _iter141 != this->success.end(); ++_iter141)
{
xfer += (*_iter141).write(oprot);
@@ -7585,7 +7585,7 @@ uint32_t Airavata_searchExperimentsByApplicationWithPagination_result::write(::a
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter152;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter152;
for (_iter152 = this->success.begin(); _iter152 != this->success.end(); ++_iter152)
{
xfer += (*_iter152).write(oprot);
@@ -7740,7 +7740,7 @@ uint32_t Airavata_searchExperimentsByStatus_args::read(::apache::thrift::protoco
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast158;
xfer += iprot->readI32(ecast158);
- this->experimentState = ( ::apache::airavata::model::workspace::experiment::ExperimentState::type)ecast158;
+ this->experimentState = ( ::apache::airavata::model::status::ExperimentState::type)ecast158;
isset_experimentState = true;
} else {
xfer += iprot->skip(ftype);
@@ -7906,7 +7906,7 @@ uint32_t Airavata_searchExperimentsByStatus_result::write(::apache::thrift::prot
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter164;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter164;
for (_iter164 = this->success.begin(); _iter164 != this->success.end(); ++_iter164)
{
xfer += (*_iter164).write(oprot);
@@ -8063,7 +8063,7 @@ uint32_t Airavata_searchExperimentsByStatusWithPagination_args::read(::apache::t
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast170;
xfer += iprot->readI32(ecast170);
- this->experimentState = ( ::apache::airavata::model::workspace::experiment::ExperimentState::type)ecast170;
+ this->experimentState = ( ::apache::airavata::model::status::ExperimentState::type)ecast170;
isset_experimentState = true;
} else {
xfer += iprot->skip(ftype);
@@ -8265,7 +8265,7 @@ uint32_t Airavata_searchExperimentsByStatusWithPagination_result::write(::apache
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter176;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter176;
for (_iter176 = this->success.begin(); _iter176 != this->success.end(); ++_iter176)
{
xfer += (*_iter176).write(oprot);
@@ -8603,7 +8603,7 @@ uint32_t Airavata_searchExperimentsByCreationTime_result::write(::apache::thrift
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter187;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter187;
for (_iter187 = this->success.begin(); _iter187 != this->success.end(); ++_iter187)
{
xfer += (*_iter187).write(oprot);
@@ -8979,7 +8979,7 @@ uint32_t Airavata_searchExperimentsByCreationTimeWithPagination_result::write(::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter198;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter198;
for (_iter198 = this->success.begin(); _iter198 != this->success.end(); ++_iter198)
{
xfer += (*_iter198).write(oprot);
@@ -9142,10 +9142,10 @@ uint32_t Airavata_searchExperiments_args::read(::apache::thrift::protocol::TProt
uint32_t _i208;
for (_i208 = 0; _i208 < _size204; ++_i208)
{
- ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type _key209;
+ ::apache::airavata::model::experiment::ExperimentSearchFields::type _key209;
int32_t ecast211;
xfer += iprot->readI32(ecast211);
- _key209 = ( ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type)ecast211;
+ _key209 = ( ::apache::airavata::model::experiment::ExperimentSearchFields::type)ecast211;
std::string& _val210 = this->filters[_key209];
xfer += iprot->readString(_val210);
}
@@ -9208,7 +9208,7 @@ uint32_t Airavata_searchExperiments_args::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("filters", ::apache::thrift::protocol::T_MAP, 3);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->filters.size()));
- std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter212;
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter212;
for (_iter212 = this->filters.begin(); _iter212 != this->filters.end(); ++_iter212)
{
xfer += oprot->writeI32((int32_t)_iter212->first);
@@ -9253,7 +9253,7 @@ uint32_t Airavata_searchExperiments_pargs::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldBegin("filters", ::apache::thrift::protocol::T_MAP, 3);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>((*(this->filters)).size()));
- std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter213;
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> ::const_iterator _iter213;
for (_iter213 = (*(this->filters)).begin(); _iter213 != (*(this->filters)).end(); ++_iter213)
{
xfer += oprot->writeI32((int32_t)_iter213->first);
@@ -9368,7 +9368,7 @@ uint32_t Airavata_searchExperiments_result::write(::apache::thrift::protocol::TP
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> ::const_iterator _iter219;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> ::const_iterator _iter219;
for (_iter219 = this->success.begin(); _iter219 != this->success.end(); ++_iter219)
{
xfer += (*_iter219).write(oprot);
@@ -9944,7 +9944,7 @@ uint32_t Airavata_getAllExperimentsInProject_result::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter230;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter230;
for (_iter230 = this->success.begin(); _iter230 != this->success.end(); ++_iter230)
{
xfer += (*_iter230).write(oprot);
@@ -10283,7 +10283,7 @@ uint32_t Airavata_getAllExperimentsInProjectWithPagination_result::write(::apach
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter241;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter241;
for (_iter241 = this->success.begin(); _iter241 != this->success.end(); ++_iter241)
{
xfer += (*_iter241).write(oprot);
@@ -10595,7 +10595,7 @@ uint32_t Airavata_getAllUserExperiments_result::write(::apache::thrift::protocol
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter252;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter252;
for (_iter252 = this->success.begin(); _iter252 != this->success.end(); ++_iter252)
{
xfer += (*_iter252).write(oprot);
@@ -10933,7 +10933,7 @@ uint32_t Airavata_getAllUserExperimentsWithPagination_result::write(::apache::th
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> ::const_iterator _iter263;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> ::const_iterator _iter263;
for (_iter263 = this->success.begin(); _iter263 != this->success.end(); ++_iter263)
{
xfer += (*_iter263).write(oprot);
@@ -12627,14 +12627,6 @@ uint32_t Airavata_launchExperiment_result::read(::apache::thrift::protocol::TPro
xfer += iprot->skip(ftype);
}
break;
- case 5:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->lve.read(iprot);
- this->__isset.lve = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -12669,10 +12661,6 @@ uint32_t Airavata_launchExperiment_result::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 4);
xfer += this->ase.write(oprot);
xfer += oprot->writeFieldEnd();
- } else if (this->__isset.lve) {
- xfer += oprot->writeFieldBegin("lve", ::apache::thrift::protocol::T_STRUCT, 5);
- xfer += this->lve.write(oprot);
- xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
@@ -12736,14 +12724,6 @@ uint32_t Airavata_launchExperiment_presult::read(::apache::thrift::protocol::TPr
xfer += iprot->skip(ftype);
}
break;
- case 5:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->lve.read(iprot);
- this->__isset.lve = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -13207,7 +13187,7 @@ uint32_t Airavata_getExperimentOutputs_result::write(::apache::thrift::protocol:
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> ::const_iterator _iter274;
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter274;
for (_iter274 = this->success.begin(); _iter274 != this->success.end(); ++_iter274)
{
xfer += (*_iter274).write(oprot);
@@ -13508,7 +13488,7 @@ uint32_t Airavata_getIntermediateOutputs_result::write(::apache::thrift::protoco
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> ::const_iterator _iter285;
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter285;
for (_iter285 = this->success.begin(); _iter285 != this->success.end(); ++_iter285)
{
xfer += (*_iter285).write(oprot);
@@ -13748,7 +13728,7 @@ uint32_t Airavata_getJobStatuses_result::read(::apache::thrift::protocol::TProto
{
std::string _key296;
xfer += iprot->readString(_key296);
- ::apache::airavata::model::workspace::experiment::JobStatus& _val297 = this->success[_key296];
+ ::apache::airavata::model::status::JobStatus& _val297 = this->success[_key296];
xfer += _val297.read(iprot);
}
xfer += iprot->readMapEnd();
@@ -13812,7 +13792,7 @@ uint32_t Airavata_getJobStatuses_result::write(::apache::thrift::protocol::TProt
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, ::apache::airavata::model::workspace::experiment::JobStatus> ::const_iterator _iter298;
+ std::map<std::string, ::apache::airavata::model::status::JobStatus> ::const_iterator _iter298;
for (_iter298 = this->success.begin(); _iter298 != this->success.end(); ++_iter298)
{
xfer += oprot->writeString(_iter298->first);
@@ -13881,7 +13861,7 @@ uint32_t Airavata_getJobStatuses_presult::read(::apache::thrift::protocol::TProt
{
std::string _key304;
xfer += iprot->readString(_key304);
- ::apache::airavata::model::workspace::experiment::JobStatus& _val305 = (*(this->success))[_key304];
+ ::apache::airavata::model::status::JobStatus& _val305 = (*(this->success))[_key304];
xfer += _val305.read(iprot);
}
xfer += iprot->readMapEnd();
@@ -14117,7 +14097,7 @@ uint32_t Airavata_getJobDetails_result::write(::apache::thrift::protocol::TProto
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::JobDetails> ::const_iterator _iter311;
+ std::vector< ::apache::airavata::model::job::JobModel> ::const_iterator _iter311;
for (_iter311 = this->success.begin(); _iter311 != this->success.end(); ++_iter311)
{
xfer += (*_iter311).write(oprot);
@@ -14237,307 +14217,6 @@ uint32_t Airavata_getJobDetails_presult::read(::apache::thrift::protocol::TProto
}
-Airavata_getDataTransferDetails_args::~Airavata_getDataTransferDetails_args() throw() {
-}
-
-
-uint32_t Airavata_getDataTransferDetails_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_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_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_airavataExperimentId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_getDataTransferDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getDataTransferDetails_args");
-
- xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->airavataExperimentId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- oprot->decrementRecursionDepth();
- return xfer;
-}
-
-
-Airavata_getDataTransferDetails_pargs::~Airavata_getDataTransferDetails_pargs() throw() {
-}
-
-
-uint32_t Airavata_getDataTransferDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getDataTransferDetails_pargs");
-
- xfer += oprot->writeFieldBegin("airavataExperimentId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->airavataExperimentId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- oprot->decrementRecursionDepth();
- return xfer;
-}
-
-
-Airavata_getDataTransferDetails_result::~Airavata_getDataTransferDetails_result() throw() {
-}
-
-
-uint32_t Airavata_getDataTransferDetails_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_LIST) {
- {
- this->success.clear();
- uint32_t _size317;
- ::apache::thrift::protocol::TType _etype320;
- xfer += iprot->readListBegin(_etype320, _size317);
- this->success.resize(_size317);
- uint32_t _i321;
- for (_i321 = 0; _i321 < _size317; ++_i321)
- {
- xfer += this->success[_i321].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->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;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_getDataTransferDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_getDataTransferDetails_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::workspace::experiment::DataTransferDetails> ::const_iterator _iter322;
- for (_iter322 = this->success.begin(); _iter322 != this->success.end(); ++_iter322)
- {
- xfer += (*_iter322).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.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();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getDataTransferDetails_presult::~Airavata_getDataTransferDetails_presult() throw() {
-}
-
-
-uint32_t Airavata_getDataTransferDetails_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_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size323;
- ::apache::thrift::protocol::TType _etype326;
- xfer += iprot->readListBegin(_etype326, _size323);
- (*(this->success)).resize(_size323);
- uint32_t _i327;
- for (_i327 = 0; _i327 < _size323; ++_i327)
- {
- xfer += (*(this->success))[_i327].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->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;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
Airavata_cloneExperiment_args::~Airavata_cloneExperiment_args() throw() {
}
@@ -15978,14 +15657,14 @@ uint32_t Airavata_getAllAppModules_result::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size328;
- ::apache::thrift::protocol::TType _etype331;
- xfer += iprot->readListBegin(_etype331, _size328);
- this->success.resize(_size328);
- uint32_t _i332;
- for (_i332 = 0; _i332 < _size328; ++_i332)
+ uint32_t _size317;
+ ::apache::thrift::protocol::TType _etype320;
+ xfer += iprot->readListBegin(_etype320, _size317);
+ this->success.resize(_size317);
+ uint32_t _i321;
+ for (_i321 = 0; _i321 < _size317; ++_i321)
{
- xfer += this->success[_i332].read(iprot);
+ xfer += this->success[_i321].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -16040,10 +15719,10 @@ uint32_t Airavata_getAllAppModules_result::write(::apache::thrift::protocol::TPr
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule> ::const_iterator _iter333;
- for (_iter333 = this->success.begin(); _iter333 != this->success.end(); ++_iter333)
+ std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule> ::const_iterator _iter322;
+ for (_iter322 = this->success.begin(); _iter322 != this->success.end(); ++_iter322)
{
- xfer += (*_iter333).write(oprot);
+ xfer += (*_iter322).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -16095,14 +15774,14 @@ uint32_t Airavata_getAllAppModules_presult::read(::apache::thrift::protocol::TPr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size334;
- ::apache::thrift::protocol::TType _etype337;
- xfer += iprot->readListBegin(_etype337, _size334);
- (*(this->success)).resize(_size334);
- uint32_t _i338;
- for (_i338 = 0; _i338 < _size334; ++_i338)
+ uint32_t _size323;
+ ::apache::thrift::protocol::TType _etype326;
+ xfer += iprot->readListBegin(_etype326, _size323);
+ (*(this->success)).resize(_size323);
+ uint32_t _i327;
+ for (_i327 = 0; _i327 < _size323; ++_i327)
{
- xfer += (*(this->success))[_i338].read(iprot);
+ xfer += (*(this->success))[_i327].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -17542,14 +17221,14 @@ uint32_t Airavata_getAllApplicationDeployments_result::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size339;
- ::apache::thrift::protocol::TType _etype342;
- xfer += iprot->readListBegin(_etype342, _size339);
- this->success.resize(_size339);
- uint32_t _i343;
- for (_i343 = 0; _i343 < _size339; ++_i343)
+ uint32_t _size328;
+ ::apache::thrift::protocol::TType _etype331;
+ xfer += iprot->readListBegin(_etype331, _size328);
+ this->success.resize(_size328);
+ uint32_t _i332;
+ for (_i332 = 0; _i332 < _size328; ++_i332)
{
- xfer += this->success[_i343].read(iprot);
+ xfer += this->success[_i332].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -17604,10 +17283,10 @@ uint32_t Airavata_getAllApplicationDeployments_result::write(::apache::thrift::p
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription> ::const_iterator _iter344;
- for (_iter344 = this->success.begin(); _iter344 != this->success.end(); ++_iter344)
+ std::vector< ::apache::airavata::model::appcatalog::appdeployment::ApplicationDeploymentDescription> ::const_iterator _iter333;
+ for (_iter333 = this->success.begin(); _iter333 != this->success.end(); ++_iter333)
{
- xfer += (*_iter344).write(oprot);
+ xfer += (*_iter333).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -17659,14 +17338,14 @@ uint32_t Airavata_getAllApplicationDeployments_presult::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size345;
- ::apache::thrift::protocol::TType _etype348;
- xfer += iprot->readListBegin(_etype348, _size345);
- (*(this->success)).resize(_size345);
- uint32_t _i349;
- for (_i349 = 0; _i349 < _size345; ++_i349)
+ uint32_t _size334;
+ ::apache::thrift::protocol::TType _etype337;
+ xfer += iprot->readListBegin(_etype337, _size334);
+ (*(this->success)).resize(_size334);
+ uint32_t _i338;
+ for (_i338 = 0; _i338 < _size334; ++_i338)
{
- xfer += (*(this->success))[_i349].read(iprot);
+ xfer += (*(this->success))[_i338].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -17823,14 +17502,14 @@ uint32_t Airavata_getAppModuleDeployedResources_result::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size350;
- ::apache::thrift::protocol::TType _etype353;
- xfer += iprot->readListBegin(_etype353, _size350);
- this->success.resize(_size350);
- uint32_t _i354;
- for (_i354 = 0; _i354 < _size350; ++_i354)
+ uint32_t _size339;
+ ::apache::thrift::protocol::TType _etype342;
+ xfer += iprot->readListBegin(_etype342, _size339);
+ this->success.resize(_size339);
+ uint32_t _i343;
+ for (_i343 = 0; _i343 < _size339; ++_i343)
{
- xfer += iprot->readString(this->success[_i354]);
+ xfer += iprot->readString(this->success[_i343]);
}
xfer += iprot->readListEnd();
}
@@ -17885,10 +17564,10 @@ uint32_t Airavata_getAppModuleDeployedResources_result::write(::apache::thrift::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::vector<std::string> ::const_iterator _iter355;
- for (_iter355 = this->success.begin(); _iter355 != this->success.end(); ++_iter355)
+ std::vector<std::string> ::const_iterator _iter344;
+ for (_iter344 = this->success.begin(); _iter344 != this->success.end(); ++_iter344)
{
- xfer += oprot->writeString((*_iter355));
+ xfer += oprot->writeString((*_iter344));
}
xfer += oprot->writeListEnd();
}
@@ -17940,14 +17619,14 @@ uint32_t Airavata_getAppModuleDeployedResources_presult::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size356;
- ::apache::thrift::protocol::TType _etype359;
- xfer += iprot->readListBegin(_etype359, _size356);
- (*(this->success)).resize(_size356);
- uint32_t _i360;
- for (_i360 = 0; _i360 < _size356; ++_i360)
+ uint32_t _size345;
+ ::apache::thrift::protocol::TType _etype348;
+ xfer += iprot->readListBegin(_etype348, _size345);
+ (*(this->success)).resize(_size345);
+ uint32_t _i349;
+ for (_i349 = 0; _i349 < _size345; ++_i349)
{
- xfer += iprot->readString((*(this->success))[_i360]);
+ xfer += iprot->readString((*(this->success))[_i349]);
}
xfer += iprot->readListEnd();
}
@@ -19138,17 +18817,17 @@ uint32_t Airavata_getAllApplicationInterfaceNames_result::read(::apache::thrift:
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size361;
- ::apache::thrift::protocol::TType _ktype362;
- ::apache::thrift::protocol::TType _vtype363;
- xfer += iprot->readMapBegin(_ktype362, _vtype363, _size361);
- uint32_t _i365;
- for (_i365 = 0; _i365 < _size361; ++_i365)
+ uint32_t _size350;
+ ::apache::thrift::protocol::TType _ktype351;
+ ::apache::thrift::protocol::TType _vtype352;
+ xfer += iprot->readMapBegin(_ktype351, _vtype352, _size350);
+ uint32_t _i354;
+ for (_i354 = 0; _i354 < _size350; ++_i354)
{
- std::string _key366;
- xfer += iprot->readString(_key366);
- std::string& _val367 = this->success[_key366];
- xfer += iprot->readString(_val367);
+ std::string _key355;
+ xfer += iprot->readString(_key355);
+ std::string& _val356 = this->success[_key355];
+ xfer += iprot->readString(_val356);
}
xfer += iprot->readMapEnd();
}
@@ -19203,11 +18882,11 @@ uint32_t Airavata_getAllApplicationInterfaceNames_result::write(::apache::thrift
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter368;
- for (_iter368 = this->success.begin(); _iter368 != this->success.end(); ++_iter368)
+ std::map<std::string, std::string> ::const_iterator _iter357;
+ for (_iter357 = this->success.begin(); _iter357 != this->success.end(); ++_iter357)
{
- xfer += oprot->writeString(_iter368->first);
- xfer += oprot->writeString(_iter368->second);
+ xfer += oprot->writeString(_iter357->first);
+ xfer += oprot->writeString(_iter357->second);
}
xfer += oprot->writeMapEnd();
}
@@ -19259,17 +18938,17 @@ uint32_t Airavata_getAllApplicationInterfaceNames_presult::read(::apache::thrift
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size369;
- ::apache::thrift::protocol::TType _ktype370;
- ::apache::thrift::protocol::TType _vtype371;
- xfer += iprot->readMapBegin(_ktype370, _vtype371, _size369);
- uint32_t _i373;
- for (_i373 = 0; _i373 < _size369; ++_i373)
+ uint32_t _size358;
+ ::apache::thrift::protocol::TType _ktype359;
+ ::apache::thrift::protocol::TType _vtype360;
+ xfer += iprot->readMapBegin(_ktype359, _vtype360, _size358);
+ uint32_t _i362;
+ for (_i362 = 0; _i362 < _size358; ++_i362)
{
- std::string _key374;
- xfer += iprot->readString(_key374);
- std::string& _val375 = (*(this->success))[_key374];
- xfer += iprot->readString(_val375);
+ std::string _key363;
+ xfer += iprot->readString(_key363);
+ std::string& _val364 = (*(this->success))[_key363];
+ xfer += iprot->readString(_val364);
}
xfer += iprot->readMapEnd();
}
@@ -19426,14 +19105,14 @@ uint32_t Airavata_getAllApplicationInterfaces_result::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size376;
- ::apache::thrift::protocol::TType _etype379;
- xfer += iprot->readListBegin(_etype379, _size376);
- this->success.resize(_size376);
- uint32_t _i380;
- for (_i380 = 0; _i380 < _size376; ++_i380)
+ uint32_t _size365;
+ ::apache::thrift::protocol::TType _etype368;
+ xfer += iprot->readListBegin(_etype368, _size365);
+ this->success.resize(_size365);
+ uint32_t _i369;
+ for (_i369 = 0; _i369 < _size365; ++_i369)
{
- xfer += this->success[_i380].read(iprot);
+ xfer += this->success[_i369].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -19488,10 +19167,10 @@ uint32_t Airavata_getAllApplicationInterfaces_result::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> ::const_iterator _iter381;
- for (_iter381 = this->success.begin(); _iter381 != this->success.end(); ++_iter381)
+ std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> ::const_iterator _iter370;
+ for (_iter370 = this->success.begin(); _iter370 != this->success.end(); ++_iter370)
{
- xfer += (*_iter381).write(oprot);
+ xfer += (*_iter370).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -19543,14 +19222,14 @@ uint32_t Airavata_getAllApplicationInterfaces_presult::read(::apache::thrift::pr
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size382;
- ::apache::thrift::protocol::TType _etype385;
- xfer += iprot->readListBegin(_etype385, _size382);
- (*(this->success)).resize(_size382);
- uint32_t _i386;
- for (_i386 = 0; _i386 < _size382; ++_i386)
+ uint32_t _size371;
+ ::apache::thrift::protocol::TType _etype374;
+ xfer += iprot->readListBegin(_etype374, _size371);
+ (*(this->success)).resize(_size371);
+ uint32_t _i375;
+ for (_i375 = 0; _i375 < _size371; ++_i375)
{
- xfer += (*(this->success))[_i386].read(iprot);
+ xfer += (*(this->success))[_i375].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -19707,14 +19386,14 @@ uint32_t Airavata_getApplicationInputs_result::read(::apache::thrift::protocol::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size387;
- ::apache::thrift::protocol::TType _etype390;
- xfer += iprot->readListBegin(_etype390, _size387);
- this->success.resize(_size387);
- uint32_t _i391;
- for (_i391 = 0; _i391 < _size387; ++_i391)
+ uint32_t _size376;
+ ::apache::thrift::protocol::TType _etype379;
+ xfer += iprot->readListBegin(_etype379, _size376);
+ this->success.resize(_size376);
+ uint32_t _i380;
+ for (_i380 = 0; _i380 < _size376; ++_i380)
{
- xfer += this->success[_i391].read(iprot);
+ xfer += this->success[_i380].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -19769,10 +19448,10 @@ uint32_t Airavata_getApplicationInputs_result::write(::apache::thrift::protocol:
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> ::const_iterator _iter392;
- for (_iter392 = this->success.begin(); _iter392 != this->success.end(); ++_iter392)
+ std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter381;
+ for (_iter381 = this->success.begin(); _iter381 != this->success.end(); ++_iter381)
{
- xfer += (*_iter392).write(oprot);
+ xfer += (*_iter381).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -19824,14 +19503,14 @@ uint32_t Airavata_getApplicationInputs_presult::read(::apache::thrift::protocol:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size393;
- ::apache::thrift::protocol::TType _etype396;
- xfer += iprot->readListBegin(_etype396, _size393);
- (*(this->success)).resize(_size393);
- uint32_t _i397;
- for (_i397 = 0; _i397 < _size393; ++_i397)
+ uint32_t _size382;
+ ::apache::thrift::protocol::TType _etype385;
+ xfer += iprot->readListBegin(_etype385, _size382);
+ (*(this->success)).resize(_size382);
+ uint32_t _i386;
+ for (_i386 = 0; _i386 < _size382; ++_i386)
{
- xfer += (*(this->success))[_i397].read(iprot);
+ xfer += (*(this->success))[_i386].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -19988,14 +19667,14 @@ uint32_t Airavata_getApplicationOutputs_result::read(::apache::thrift::protocol:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size398;
- ::apache::thrift::protocol::TType _etype401;
- xfer += iprot->readListBegin(_etype401, _size398);
- this->success.resize(_size398);
- uint32_t _i402;
- for (_i402 = 0; _i402 < _size398; ++_i402)
+ uint32_t _size387;
+ ::apache::thrift::protocol::TType _etype390;
+ xfer += iprot->readListBegin(_etype390, _size387);
+ this->success.resize(_size387);
+ uint32_t _i391;
+ for (_i391 = 0; _i391 < _size387; ++_i391)
{
- xfer += this->success[_i402].read(iprot);
+ xfer += this->success[_i391].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -20050,10 +19729,10 @@ uint32_t Airavata_getApplicationOutputs_result::write(::apache::thrift::protocol
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> ::const_iterator _iter403;
- for (_iter403 = this->success.begin(); _iter403 != this->success.end(); ++_iter403)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter392;
+ for (_iter392 = this->success.begin(); _iter392 != this->success.end(); ++_iter392)
{
- xfer += (*_iter403).write(oprot);
+ xfer += (*_iter392).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -20105,14 +19784,14 @@ uint32_t Airavata_getApplicationOutputs_presult::read(::apache::thrift::protocol
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size404;
- ::apache::thrift::protocol::TType _etype407;
- xfer += iprot->readListBegin(_etype407, _size404);
- (*(this->success)).resize(_size404);
- uint32_t _i408;
- for (_i408 = 0; _i408 < _size404; ++_i408)
+ uint32_t _size393;
+ ::apache::thrift::protocol::TType _etype396;
+ xfer += iprot->readListBegin(_etype396, _size393);
+ (*(this->success)).resize(_size393);
+ uint32_t _i397;
+ for (_i397 = 0; _i397 < _size393; ++_i397)
{
- xfer += (*(this->success))[_i408].read(iprot);
+ xfer += (*(this->success))[_i397].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -20269,17 +19948,17 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_result::read(::apache
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size409;
- ::apache::thrift::protocol::TType _ktype410;
- ::apache::thrift::protocol::TType _vtype411;
- xfer += iprot->readMapBegin(_ktype410, _vtype411, _size409);
- uint32_t _i413;
- for (_i413 = 0; _i413 < _size409; ++_i413)
+ uint32_t _size398;
+ ::apache::thrift::protocol::TType _ktype399;
+ ::apache::thrift::protocol::TType _vtype400;
+ xfer += iprot->readMapBegin(_ktype399, _vtype400, _size398);
+ uint32_t _i402;
+ for (_i402 = 0; _i402 < _size398; ++_i402)
{
- std::string _key414;
- xfer += iprot->readString(_key414);
- std::string& _val415 = this->success[_key414];
- xfer += iprot->readString(_val415);
+ std::string _key403;
+ xfer += iprot->readString(_key403);
+ std::string& _val404 = this->success[_key403];
+ xfer += iprot->readString(_val404);
}
xfer += iprot->readMapEnd();
}
@@ -20334,11 +20013,11 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_result::write(::apach
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter416;
- for (_iter416 = this->success.begin(); _iter416 != this->success.end(); ++_iter416)
+ std::map<std::string, std::string> ::const_iterator _iter405;
+ for (_iter405 = this->success.begin(); _iter405 != this->success.end(); ++_iter405)
{
- xfer += oprot->writeString(_iter416->first);
- xfer += oprot->writeString(_iter416->second);
+ xfer += oprot->writeString(_iter405->first);
+ xfer += oprot->writeString(_iter405->second);
}
xfer += oprot->writeMapEnd();
}
@@ -20390,17 +20069,17 @@ uint32_t Airavata_getAvailableAppInterfaceComputeResources_presult::read(::apach
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size417;
- ::apache::thrift::protocol::TType _ktype418;
- ::apache::thrift::protocol::TType _vtype419;
- xfer += iprot->readMapBegin(_ktype418, _vtype419, _size417);
- uint32_t _i421;
- for (_i421 = 0; _i421 < _size417; ++_i421)
+ uint32_t _size406;
+ ::apache::thrift::protocol::TType _ktype407;
+ ::apache::thrift::protocol::TType _vtype408;
+ xfer += iprot->readMapBegin(_ktype407, _vtype408, _size406);
+ uint32_t _i410;
+ for (_i410 = 0; _i410 < _size406; ++_i410)
{
- std::string _key422;
- xfer += iprot->readString(_key422);
- std::string& _val423 = (*(this->success))[_key422];
- xfer += iprot->readString(_val423);
+ std::string _key411;
+ xfer += iprot->readString(_key411);
+ std::string& _val412 = (*(this->success))[_key411];
+ xfer += iprot->readString(_val412);
}
xfer += iprot->readMapEnd();
}
@@ -21031,17 +20710,17 @@ uint32_t Airavata_getAllComputeResourceNames_result::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size424;
- ::apache::thrift::protocol::TType _ktype425;
- ::apache::thrift::protocol::TType _vtype426;
- xfer += iprot->readMapBegin(_ktype425, _vtype426, _size424);
- uint32_t _i428;
- for (_i428 = 0; _i428 < _size424; ++_i428)
+ uint32_t _size413;
+ ::apache::thrift::protocol::TType _ktype414;
+ ::apache::thrift::protocol::TType _vtype415;
+ xfer += iprot->readMapBegin(_ktype414, _vtype415, _size413);
+ uint32_t _i417;
+ for (_i417 = 0; _i417 < _size413; ++_i417)
{
- std::string _key429;
- xfer += iprot->readString(_key429);
- std::string& _val430 = this->success[_key429];
- xfer += iprot->readString(_val430);
+ std::string _key418;
+ xfer += iprot->readString(_key418);
+ std::string& _val419 = this->success[_key418];
+ xfer += iprot->readString(_val419);
}
xfer += iprot->readMapEnd();
}
@@ -21096,11 +20775,11 @@ uint32_t Airavata_getAllComputeResourceNames_result::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::map<std::string, std::string> ::const_iterator _iter431;
- for (_iter431 = this->success.begin(); _iter431 != this->success.end(); ++_iter431)
+ std::map<std::string, std::string> ::const_iterator _iter420;
+ for (_iter420 = this->success.begin(); _iter420 != this->success.end(); ++_iter420)
{
- xfer += oprot->writeString(_iter431->first);
- xfer += oprot->writeString(_iter431->second);
+ xfer += oprot->writeString(_iter420->first);
+ xfer += oprot->writeString(_iter420->second);
}
xfer += oprot->writeMapEnd();
}
@@ -21152,17 +20831,17 @@ uint32_t Airavata_getAllComputeResourceNames_presult::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size432;
- ::apache::thrift::protocol::TType _ktype433;
- ::apache::thrift::protocol::TType _vtype434;
- xfer += iprot->readMapBegin(_ktype433, _vtype434, _size432);
- uint32_t _i436;
- for (_i436 = 0; _i436 < _size432; ++_i436)
+ uint32_t _size421;
+ ::apache::thrift::protocol::TType _ktype422;
+ ::apache::thrift::protocol::TType _vtype423;
+ xfer += iprot->readMapBegin(_ktype422, _vtype423, _size421);
+ uint32_t _i425;
+ for (_i425 = 0; _i425 < _size421; ++_i425)
{
- std::string _key437;
- xfer += iprot->readString(_key437);
- std::string& _val438 = (*(this->success))[_key437];
- xfer += iprot->readString(_val438);
+ std::string _key426;
+ xfer += iprot->readString(_key426);
+ std::string& _val427 = (*(this->success))[_key426];
+ xfer += iprot->readString(_val427);
}
xfer += iprot->readMapEnd();
}
@@ -28722,17 +28401,17 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::pro
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->jobSubmissionPriorityMap.clear();
- uint32_t _size439;
- ::apache::thrift::protocol::TType _ktype440;
- ::apache::thrift::protocol::TType _vtype441;
- xfer += iprot->readMapBegin(_ktype440, _vtype441, _size439);
- uint32_t _i443;
- for (_i443 = 0; _i443 < _size439; ++_i443)
+ uint32_t _size428;
+ ::apache::thrift::protocol::TType _ktype429;
+ ::apache::thrift::protocol::TType _vtype430;
+ xfer += iprot->readMapBegin(_ktype429, _vtype430, _size428);
+ uint32_t _i432;
+ for (_i432 = 0; _i432 < _size428; ++_i432)
{
- std::string _key444;
- xfer += iprot->readString(_key444);
- int32_t& _val445 = this->jobSubmissionPriorityMap[_key444];
- xfer += iprot->readI32(_val445);
+ std::string _key433;
+ xfer += iprot->readString(_key433);
+ int32_t& _val434 = this->jobSubmissionPriorityMap[_key433];
+ xfer += iprot->readI32(_val434);
}
xfer += iprot->readMapEnd();
}
@@ -28763,11 +28442,11 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter446;
- for (_iter446 = this->jobSubmissionPriorityMap.begin(); _iter446 != this->jobSubmissionPriorityMap.end(); ++_iter446)
+ std::map<std::string, int32_t> ::const_iterator _iter435;
+ for (_iter435 = this->jobSubmissionPriorityMap.begin(); _iter435 != this->jobSubmissionPriorityMap.end(); ++_iter435)
{
- xfer += oprot->writeString(_iter446->first);
- xfer += oprot->writeI32(_iter446->second);
+ xfer += oprot->writeString(_iter435->first);
+ xfer += oprot->writeI32(_iter435->second);
}
xfer += oprot->writeMapEnd();
}
@@ -28792,11 +28471,11 @@ uint32_t Airavata_changeJobSubmissionPriorities_pargs::write(::apache::thrift::p
xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->jobSubmissionPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter447;
- for (_iter447 = (*(this->jobSubmissionPriorityMap)).begin(); _iter447 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter447)
+ std::map<std::string, int32_t> ::const_iterator _iter436;
+ for (_iter436 = (*(this->jobSubmissionPriorityMap)).begin(); _iter436 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter436)
{
- xfer += oprot->writeString(_iter447->first);
- xfer += oprot->writeI32(_iter447->second);
+ xfer += oprot->writeString(_iter436->first);
+ xfer += oprot->writeI32(_iter436->second);
}
xfer += oprot->writeMapEnd();
}
@@ -29004,17 +28683,17 @@ uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::prot
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->dataMovementPriorityMap.clear();
- uint32_t _size448;
- ::apache::thrift::protocol::TType _ktype449;
- ::apache::thrift::protocol::TType _vtype450;
- xfer += iprot->readMapBegin(_ktype449, _vtype450, _size448);
- uint32_t _i452;
- for (_i452 = 0; _i452 < _size448; ++_i452)
+ uint32_t _size437;
+ ::apache::thrift::protocol::TType _ktype438;
+ ::apache::thrift::protocol::TType _vtype439;
+ xfer += iprot->readMapBegin(_ktype438, _vtype439, _size437);
+ uint32_t _i441;
+ for (_i441 = 0; _i441 < _size437; ++_i441)
{
- std::string _key453;
- xfer += iprot->readString(_key453);
- int32_t& _val454 = this->dataMovementPriorityMap[_key453];
- xfer += iprot->readI32(_val454);
+ std::string _key442;
+ xfer += iprot->readString(_key442);
+ int32_t& _val443 = this->dataMovementPriorityMap[_key442];
+ xfer += iprot->readI32(_val443);
}
xfer += iprot->readMapEnd();
}
@@ -29045,11 +28724,11 @@ uint32_t Airavata_changeDataMovementPriorities_args::write(::apache::thrift::pro
xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter455;
- for (_iter455 = this->dataMovementPriorityMap.begin(); _iter455 != this->dataMovementPriorityMap.end(); ++_iter455)
+ std::map<std::string, int32_t> ::const_iterator _iter444;
+ for (_iter444 = this->dataMovementPriorityMap.begin(); _iter444 != this->dataMovementPriorityMap.end(); ++_iter444)
{
- xfer += oprot->writeString(_iter455->first);
- xfer += oprot->writeI32(_iter455->second);
+ xfer += oprot->writeString(_iter444->first);
+ xfer += oprot->writeI32(_iter444->second);
}
xfer += oprot->writeMapEnd();
}
@@ -29074,11 +28753,11 @@ uint32_t Airavata_changeDataMovementPriorities_pargs::write(::apache::thrift::pr
xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->dataMovementPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter456;
- for (_iter456 = (*(this->dataMovementPriorityMap)).begin(); _iter456 != (*(this->dataMovementPriorityMap)).end(); ++_iter456)
+ std::map<std::string, int32_t> ::const_iterator _iter445;
+ for (_iter445 = (*(this->dataMovementPriorityMap)).begin(); _iter445 != (*(this->dataMovementPriorityMap)).end(); ++_iter445)
{
- xfer += oprot->writeString(_iter456->first);
- xfer += oprot->writeI32(_iter456->second);
+ xfer += oprot->writeString(_iter445->first);
+ xfer += oprot->writeI32(_iter445->second);
}
xfer += oprot->writeMapEnd();
}
@@ -32757,14 +32436,14 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_result::read(::apache:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size457;
- ::apache::thrift::protocol::TType _etype460;
- xfer += iprot->readListBegin(_etype460, _size457);
- this->success.resize(_size457);
- uint32_t _i461;
- for (_i461 = 0; _i461 < _size457; ++_i461)
+ uint32_t _size446;
+ ::apache::thrift::protocol::TType _etype449;
+ xfer += iprot->readListBegin(_etype449, _size446);
+ this->success.resize(_size446);
+ uint32_t _i450;
+ for (_i450 = 0; _i450 < _size446; ++_i450)
{
- xfer += this->success[_i461].read(iprot);
+ xfer += this->success[_i450].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -32819,10 +32498,10 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_result::write(::apache
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> ::const_iterator _iter462;
- for (_iter462 = this->success.begin(); _iter462 != this->success.end(); ++_iter462)
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> ::const_iterator _iter451;
+ for (_iter451 = this->success.begin(); _iter451 != this->success.end(); ++_iter451)
{
- xfer += (*_iter462).write(oprot);
+ xfer += (*_iter451).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -32874,14 +32553,14 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_presult::read(::apache
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size463;
- ::apache::thrift::protocol::TType _etype466;
- xfer += iprot->readListBegin(_etype466, _size463);
- (*(this->success)).resize(_size463);
- uint32_t _i467;
- for (_i467 = 0; _i467 < _size463; ++_i467)
+ uint32_t _size452;
+ ::apache::thrift::protocol::TType _etype455;
+ xfer += iprot->readListBegin(_etype455, _size452);
+ (*(this->success)).resize(_size452);
+ uint32_t _i456;
+ for (_i456 = 0; _i456 < _size452; ++_i456)
{
- xfer += (*(this->success))[_i467].read(iprot);
+ xfer += (*(this->success))[_i456].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -33014,14 +32693,14 @@ uint32_t Airavata_getAllGatewayComputeResources_result::read(::apache::thrift::p
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size468;
- ::apache::thrift::protocol::TType _etype471;
- xfer += iprot->readListBegin(_etype471, _size468);
- this->success.resize(_size468);
- uint32_t _i472;
- for (_i472 = 0; _i472 < _size468; ++_i472)
+ uint32_t _size457;
+ ::apache::thrift::protocol::TType _etype460;
+ xfer += iprot->readListBegin(_etype460, _size457);
+ this->success.resize(_size457);
+ uint32_t _i461;
+ for (_i461 = 0; _i461 < _size457; ++_i461)
{
- xfer += this->success[_i472].read(iprot);
+ xfer += this->success[_i461].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -33076,10 +32755,10 @@ uint32_t Airavata_getAllGatewayComputeResources_result::write(::apache::thrift::
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> ::const_iterator _iter473;
- for (_iter473 = this->success.begin(); _iter473 != this->success.end(); ++_iter473)
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> ::const_iterator _iter462;
+ for (_iter462 = this->success.begin(); _iter462 != this->success.end(); ++_iter462)
{
- xfer += (*_iter473).write(oprot);
+ xfer += (*_iter462).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -33131,14 +32810,14 @@ uint32_t Airavata_getAllGatewayComputeResources_presult::read(::apache::thrift::
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size474;
- ::apache::thrift::protocol::TType _etype477;
- xfer += iprot->readListBegin(_etype477, _size474);
- (*(this->success)).resize(_size474);
- uint32_t _i478;
- for (_i478 = 0; _i478 < _size474; ++_i478)
+ uint32_t _size463;
+ ::apache::thrift::protocol::TType _etype466;
+ xfer += iprot->readListBegin(_etype466, _size463);
+ (*(this->success)).resize(_size463);
+ uint32_t _i467;
+ for (_i467 = 0; _i467 < _size463; ++_i467)
{
- xfer += (*(this->success))[_i478].read(iprot);
+ xfer += (*(this->success))[_i467].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -33850,14 +33529,14 @@ uint32_t Airavata_getAllWorkflows_result::read(::apache::thrift::protocol::TProt
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size479;
- ::apache::thrift::protocol::TType _etype482;
- xfer += iprot->readListBegin(_etype482, _size479);
- this->success.resize(_size479);
- uint32_t _i483;
- for (_i483 = 0; _i483 < _size479; ++_i483)
+ uint32_t _size468;
+ ::apache::thrift::protocol::TType _etype471;
+ xfer += iprot->readListBegin(_etype471, _size468);
+ this->success.resize(_size468);
+ uint32_t _i472;
+ for (_i472 = 0; _i472 < _size468; ++_i472)
{
- xfer += iprot->readString(this->success[_i483]);
+ xfer += iprot->readString(this->success[_i472]);
}
xfer += iprot->readListEnd();
}
@@ -33912,10 +33591,10 @@ uint32_t Airavata_getAllWorkflows_result::write(::apache::thrift::protocol::TPro
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
- std::vector<std::string> ::const_iterator _iter484;
- for (_iter484 = this->success.begin(); _iter484 != this->success.end(); ++_iter484)
+ std::vector<std::string> ::const_iterator _iter473;
+ for (_iter473 = this->success.begin(); _iter473 != this->success.end(); ++_iter473)
{
- xfer += oprot->writeString((*_iter484));
+ xfer += oprot->writeString((*_iter473));
}
xfer += oprot->writeListEnd();
}
@@ -33967,14 +33646,14 @@ uint32_t Airavata_getAllWorkflows_presult::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size485;
- ::apache::thrift::protocol::TType _etype488;
- xfer += iprot->readListBegin(_etype488, _size485);
- (*(this->success)).resize(_size485);
- uint32_t _i489;
- for (_i489 = 0; _i489 < _size485; ++_i489)
+ uint32_t _size474;
+ ::apache::thrift::protocol::TType _etype477;
+ xfer += iprot->readListBegin(_etype477, _size474);
+ (*(this->success)).resize(_size474);
+ uint32_t _i478;
+ for (_i478 = 0; _i478 < _size474; ++_i478)
{
- xfer += iprot->readString((*(this->success))[_i489]);
+ xfer += iprot->readString((*(this->success))[_i478]);
}
xfer += iprot->readListEnd();
}
@@ -36872,7 +36551,7 @@ void AiravataClient::recv_searchProjectsByProjectDescWithPagination(std::vector<
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchProjectsByProjectDescWithPagination failed: unknown result");
}
-void AiravataClient::searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName)
+void AiravataClient::searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName)
{
send_searchExperimentsByName(gatewayId, userName, expName);
recv_searchExperimentsByName(_return);
@@ -36894,7 +36573,7 @@ void AiravataClient::send_searchExperimentsByName(const std::string& gatewayId,
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -36941,7 +36620,7 @@ void AiravataClient::recv_searchExperimentsByName(std::vector< ::apache::airavat
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByName failed: unknown result");
}
-void AiravataClient::searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset)
{
send_searchExperimentsByNameWithPagination(gatewayId, userName, expName, limit, offset);
recv_searchExperimentsByNameWithPagination(_return);
@@ -36965,7 +36644,7 @@ void AiravataClient::send_searchExperimentsByNameWithPagination(const std::strin
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37012,7 +36691,7 @@ void AiravataClient::recv_searchExperimentsByNameWithPagination(std::vector< ::a
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByNameWithPagination failed: unknown result");
}
-void AiravataClient::searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description)
+void AiravataClient::searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description)
{
send_searchExperimentsByDesc(gatewayId, userName, description);
recv_searchExperimentsByDesc(_return);
@@ -37034,7 +36713,7 @@ void AiravataClient::send_searchExperimentsByDesc(const std::string& gatewayId,
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37081,7 +36760,7 @@ void AiravataClient::recv_searchExperimentsByDesc(std::vector< ::apache::airavat
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
}
-void AiravataClient::searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset)
{
send_searchExperimentsByDescWithPagination(gatewayId, userName, description, limit, offset);
recv_searchExperimentsByDescWithPagination(_return);
@@ -37105,7 +36784,7 @@ void AiravataClient::send_searchExperimentsByDescWithPagination(const std::strin
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37152,7 +36831,7 @@ void AiravataClient::recv_searchExperimentsByDescWithPagination(std::vector< ::a
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByDescWithPagination failed: unknown result");
}
-void AiravataClient::searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId)
+void AiravataClient::searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId)
{
send_searchExperimentsByApplication(gatewayId, userName, applicationId);
recv_searchExperimentsByApplication(_return);
@@ -37174,7 +36853,7 @@ void AiravataClient::send_searchExperimentsByApplication(const std::string& gate
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37221,7 +36900,7 @@ void AiravataClient::recv_searchExperimentsByApplication(std::vector< ::apache::
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
}
-void AiravataClient::searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset)
{
send_searchExperimentsByApplicationWithPagination(gatewayId, userName, applicationId, limit, offset);
recv_searchExperimentsByApplicationWithPagination(_return);
@@ -37245,7 +36924,7 @@ void AiravataClient::send_searchExperimentsByApplicationWithPagination(const std
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37292,13 +36971,13 @@ void AiravataClient::recv_searchExperimentsByApplicationWithPagination(std::vect
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByApplicationWithPagination failed: unknown result");
}
-void AiravataClient::searchExperimentsByStatus(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState)
+void AiravataClient::searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState)
{
send_searchExperimentsByStatus(gatewayId, userName, experimentState);
recv_searchExperimentsByStatus(_return);
}
-void AiravataClient::send_searchExperimentsByStatus(const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState)
+void AiravataClient::send_searchExperimentsByStatus(const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("searchExperimentsByStatus", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -37314,7 +36993,7 @@ void AiravataClient::send_searchExperimentsByStatus(const std::string& gatewayId
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByStatus(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37361,13 +37040,13 @@ void AiravataClient::recv_searchExperimentsByStatus(std::vector< ::apache::airav
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
}
-void AiravataClient::searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset)
{
send_searchExperimentsByStatusWithPagination(gatewayId, userName, experimentState, limit, offset);
recv_searchExperimentsByStatusWithPagination(_return);
}
-void AiravataClient::send_searchExperimentsByStatusWithPagination(const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState, const int32_t limit, const int32_t offset)
+void AiravataClient::send_searchExperimentsByStatusWithPagination(const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("searchExperimentsByStatusWithPagination", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -37385,7 +37064,7 @@ void AiravataClient::send_searchExperimentsByStatusWithPagination(const std::str
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37432,7 +37111,7 @@ void AiravataClient::recv_searchExperimentsByStatusWithPagination(std::vector< :
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByStatusWithPagination failed: unknown result");
}
-void AiravataClient::searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime)
+void AiravataClient::searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime)
{
send_searchExperimentsByCreationTime(gatewayId, userName, fromTime, toTime);
recv_searchExperimentsByCreationTime(_return);
@@ -37455,7 +37134,7 @@ void AiravataClient::send_searchExperimentsByCreationTime(const std::string& gat
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37502,7 +37181,7 @@ void AiravataClient::recv_searchExperimentsByCreationTime(std::vector< ::apache:
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
}
-void AiravataClient::searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset)
{
send_searchExperimentsByCreationTimeWithPagination(gatewayId, userName, fromTime, toTime, limit, offset);
recv_searchExperimentsByCreationTimeWithPagination(_return);
@@ -37527,7 +37206,7 @@ void AiravataClient::send_searchExperimentsByCreationTimeWithPagination(const st
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return)
+void AiravataClient::recv_searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
{
int32_t rseqid = 0;
@@ -37574,13 +37253,13 @@ void AiravataClient::recv_searchExperimentsByCreationTimeWithPagination(std::vec
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperimentsByCreationTimeWithPagination failed: unknown result");
}
-void AiravataClient::searchExperiments(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
+void AiravataClient::searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
{
send_searchExperiments(gatewayId, userName, filters, limit, offset);
recv_searchExperiments(_return);
}
-void AiravataClient::send_searchExperiments(const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
+void AiravataClient::send_searchExperiments(const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment:
<TRUNCATED>
[14/14] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a2dce4f8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a2dce4f8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a2dce4f8
Branch: refs/heads/master
Commit: a2dce4f8c1a1cdc5f8a32bd8dd56a5dad0a35fcd
Parents: 144c1d8 013e8c0
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jun 24 03:05:52 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jun 24 03:05:52 2015 +0530
----------------------------------------------------------------------
.../core/cluster/AbstractRemoteCluster.java | 17 ++-
.../gfac/core/context/ProcessContext.java | 16 +++
.../org/apache/airavata/gfac/impl/Factory.java | 138 ++++++++++++++++---
.../airavata/gfac/impl/GFacEngineImpl.java | 69 +++++-----
.../airavata/gfac/impl/HPCRemoteCluster.java | 20 ++-
.../gfac/impl/job/LSFJobConfiguration.java | 14 +-
.../gfac/impl/job/PBSJobConfiguration.java | 35 +++--
.../gfac/impl/job/SlurmJobConfiguration.java | 14 +-
.../gfac/impl/job/UGEJobConfiguration.java | 15 +-
.../airavata/gfac/server/GfacServerHandler.java | 2 +-
10 files changed, 224 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
[03/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 332482b..935de1f 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
@@ -1,4 +1,21 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
* Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
@@ -6,17 +23,32 @@
*/
package org.apache.airavata.model.experiment;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -35,7 +67,7 @@ import java.util.*;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");
@@ -63,27 +95,23 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
schemes.put(TupleScheme.class, new ExperimentModelTupleSchemeFactory());
}
- public String experimentId; // required
- public String projectId; // required
- public String gatewayId; // required
- /**
- *
- * @see org.apache.airavata.model.experiment.ExperimentType
- */
- public ExperimentType experimentType; // required
- public String userName; // required
- public String experimentName; // required
- public long creationTime; // optional
- public String description; // optional
- public String executionId; // optional
- public String gatewayExecutionId; // optional
- public boolean enableEmailNotification; // optional
- public List<String> emailAddresses; // optional
- public UserConfigurationDataModel userConfigurationData; // optional
- public List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
- public List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs; // optional
- public org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
- public List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
+ private String experimentId; // required
+ private String projectId; // required
+ private String gatewayId; // required
+ private ExperimentType experimentType; // required
+ private String userName; // required
+ private String experimentName; // required
+ private long creationTime; // optional
+ private String description; // optional
+ private String executionId; // optional
+ private String gatewayExecutionId; // optional
+ private boolean enableEmailNotification; // optional
+ private List<String> emailAddresses; // optional
+ private UserConfigurationDataModel userConfigurationData; // optional
+ private List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs; // optional
+ 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
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -92,7 +120,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
GATEWAY_ID((short)3, "gatewayId"),
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
EXPERIMENT_TYPE((short)4, "experimentType"),
USER_NAME((short)5, "userName"),
@@ -246,11 +274,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
public ExperimentModel() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
}
@@ -344,12 +368,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
@Override
public void clear() {
- this.experimentId = "DO_NOT_SET_AT_CLIENTS";
-
- this.projectId = "DEFAULT_PROJECT";
-
+ this.experimentId = null;
+ this.projectId = null;
this.gatewayId = null;
- this.experimentType = ExperimentType.SINGLE_APPLICATION;
+ this.experimentType = org.apache.airavata.model.experiment.ExperimentType.SINGLE_APPLICATION;
this.userName = null;
this.experimentName = null;
@@ -372,9 +394,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentId;
}
- public ExperimentModel setExperimentId(String experimentId) {
+ public void setExperimentId(String experimentId) {
this.experimentId = experimentId;
- return this;
}
public void unsetExperimentId() {
@@ -396,9 +417,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.projectId;
}
- public ExperimentModel setProjectId(String projectId) {
+ public void setProjectId(String projectId) {
this.projectId = projectId;
- return this;
}
public void unsetProjectId() {
@@ -420,9 +440,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.gatewayId;
}
- public ExperimentModel setGatewayId(String gatewayId) {
+ public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
- return this;
}
public void unsetGatewayId() {
@@ -442,7 +461,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
public ExperimentType getExperimentType() {
return this.experimentType;
@@ -450,11 +469,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
/**
*
- * @see org.apache.airavata.model.experiment.ExperimentType
+ * @see ExperimentType
*/
- public ExperimentModel setExperimentType(ExperimentType experimentType) {
+ public void setExperimentType(ExperimentType experimentType) {
this.experimentType = experimentType;
- return this;
}
public void unsetExperimentType() {
@@ -476,9 +494,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userName;
}
- public ExperimentModel setUserName(String userName) {
+ public void setUserName(String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -500,9 +517,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentName;
}
- public ExperimentModel setExperimentName(String experimentName) {
+ public void setExperimentName(String experimentName) {
this.experimentName = experimentName;
- return this;
}
public void unsetExperimentName() {
@@ -524,10 +540,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.creationTime;
}
- public ExperimentModel setCreationTime(long creationTime) {
+ public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
setCreationTimeIsSet(true);
- return this;
}
public void unsetCreationTime() {
@@ -547,9 +562,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.description;
}
- public ExperimentModel setDescription(String description) {
+ public void setDescription(String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -571,9 +585,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.executionId;
}
- public ExperimentModel setExecutionId(String executionId) {
+ public void setExecutionId(String executionId) {
this.executionId = executionId;
- return this;
}
public void unsetExecutionId() {
@@ -595,9 +608,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.gatewayExecutionId;
}
- public ExperimentModel setGatewayExecutionId(String gatewayExecutionId) {
+ public void setGatewayExecutionId(String gatewayExecutionId) {
this.gatewayExecutionId = gatewayExecutionId;
- return this;
}
public void unsetGatewayExecutionId() {
@@ -619,10 +631,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.enableEmailNotification;
}
- public ExperimentModel setEnableEmailNotification(boolean enableEmailNotification) {
+ public void setEnableEmailNotification(boolean enableEmailNotification) {
this.enableEmailNotification = enableEmailNotification;
setEnableEmailNotificationIsSet(true);
- return this;
}
public void unsetEnableEmailNotification() {
@@ -657,9 +668,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.emailAddresses;
}
- public ExperimentModel setEmailAddresses(List<String> emailAddresses) {
+ public void setEmailAddresses(List<String> emailAddresses) {
this.emailAddresses = emailAddresses;
- return this;
}
public void unsetEmailAddresses() {
@@ -681,9 +691,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.userConfigurationData;
}
- public ExperimentModel setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
+ public void setUserConfigurationData(UserConfigurationDataModel userConfigurationData) {
this.userConfigurationData = userConfigurationData;
- return this;
}
public void unsetUserConfigurationData() {
@@ -720,9 +729,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentInputs;
}
- public ExperimentModel setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
+ public void setExperimentInputs(List<org.apache.airavata.model.application.io.InputDataObjectType> experimentInputs) {
this.experimentInputs = experimentInputs;
- return this;
}
public void unsetExperimentInputs() {
@@ -759,9 +767,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentOutputs;
}
- public ExperimentModel setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
+ public void setExperimentOutputs(List<org.apache.airavata.model.application.io.OutputDataObjectType> experimentOutputs) {
this.experimentOutputs = experimentOutputs;
- return this;
}
public void unsetExperimentOutputs() {
@@ -783,9 +790,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.experimentStatus;
}
- public ExperimentModel setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
+ public void setExperimentStatus(org.apache.airavata.model.status.ExperimentStatus experimentStatus) {
this.experimentStatus = experimentStatus;
- return this;
}
public void unsetExperimentStatus() {
@@ -822,9 +828,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return this.errors;
}
- public ExperimentModel setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
+ public void setErrors(List<org.apache.airavata.model.commons.ErrorModel> errors) {
this.errors = errors;
- return this;
}
public void unsetErrors() {
@@ -1531,11 +1536,11 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1697,26 +1702,32 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (experimentId == null) {
- throw new TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
+ if (!isSetExperimentId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
}
- if (projectId == null) {
- throw new TProtocolException("Required field 'projectId' was not present! Struct: " + toString());
+
+ if (!isSetProjectId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString());
}
- if (gatewayId == null) {
- throw new TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
+
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
- if (experimentType == null) {
- throw new TProtocolException("Required field 'experimentType' was not present! Struct: " + toString());
+
+ if (!isSetExperimentType()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentType' is unset! Struct:" + toString());
}
- if (userName == null) {
- throw new TProtocolException("Required field 'userName' was not present! Struct: " + toString());
+
+ if (!isSetUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
}
- if (experimentName == null) {
- throw new TProtocolException("Required field 'experimentName' was not present! Struct: " + toString());
+
+ if (!isSetExperimentName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentName' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
if (userConfigurationData != null) {
userConfigurationData.validate();
@@ -1729,7 +1740,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1739,7 +1750,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1752,7 +1763,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelStandardScheme extends StandardScheme<ExperimentModel> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1788,7 +1799,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
break;
case 4: // EXPERIMENT_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1949,12 +1960,10 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentModel struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -2104,7 +2113,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static class ExperimentModelTupleScheme extends TupleScheme<ExperimentModel> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
oprot.writeString(struct.projectId);
@@ -2207,7 +2216,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentModel struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
@@ -2215,7 +2224,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setProjectIdIsSet(true);
struct.gatewayId = iprot.readString();
struct.setGatewayIdIsSet(true);
- struct.experimentType = ExperimentType.findByValue(iprot.readI32());
+ struct.experimentType = org.apache.airavata.model.experiment.ExperimentType.findByValue(iprot.readI32());
struct.setExperimentTypeIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 cd64683..ed91100 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 64918ff..3c43807 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
@@ -1,4 +1,21 @@
/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
* Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
@@ -6,20 +23,35 @@
*/
package org.apache.airavata.model.experiment;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-22")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");
@@ -40,16 +72,16 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
schemes.put(TupleScheme.class, new ExperimentSummaryModelTupleSchemeFactory());
}
- public String experimentId; // required
- public String projectId; // required
- public String gatewayId; // required
- public long creationTime; // optional
- public String userName; // required
- public String name; // required
- public String description; // optional
- public String executionId; // optional
- public String experimentStatus; // optional
- public long statusUpdateTime; // optional
+ private String experimentId; // required
+ private String projectId; // required
+ private String gatewayId; // required
+ private long creationTime; // optional
+ private String userName; // required
+ private String name; // required
+ private String description; // optional
+ private String executionId; // optional
+ private String experimentStatus; // optional
+ private long statusUpdateTime; // 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 {
@@ -243,9 +275,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.experimentId;
}
- public ExperimentSummaryModel setExperimentId(String experimentId) {
+ public void setExperimentId(String experimentId) {
this.experimentId = experimentId;
- return this;
}
public void unsetExperimentId() {
@@ -267,9 +298,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.projectId;
}
- public ExperimentSummaryModel setProjectId(String projectId) {
+ public void setProjectId(String projectId) {
this.projectId = projectId;
- return this;
}
public void unsetProjectId() {
@@ -291,9 +321,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.gatewayId;
}
- public ExperimentSummaryModel setGatewayId(String gatewayId) {
+ public void setGatewayId(String gatewayId) {
this.gatewayId = gatewayId;
- return this;
}
public void unsetGatewayId() {
@@ -315,10 +344,9 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.creationTime;
}
- public ExperimentSummaryModel setCreationTime(long creationTime) {
+ public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
setCreationTimeIsSet(true);
- return this;
}
public void unsetCreationTime() {
@@ -338,9 +366,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.userName;
}
- public ExperimentSummaryModel setUserName(String userName) {
+ public void setUserName(String userName) {
this.userName = userName;
- return this;
}
public void unsetUserName() {
@@ -362,9 +389,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.name;
}
- public ExperimentSummaryModel setName(String name) {
+ public void setName(String name) {
this.name = name;
- return this;
}
public void unsetName() {
@@ -386,9 +412,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.description;
}
- public ExperimentSummaryModel setDescription(String description) {
+ public void setDescription(String description) {
this.description = description;
- return this;
}
public void unsetDescription() {
@@ -410,9 +435,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.executionId;
}
- public ExperimentSummaryModel setExecutionId(String executionId) {
+ public void setExecutionId(String executionId) {
this.executionId = executionId;
- return this;
}
public void unsetExecutionId() {
@@ -434,9 +458,8 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.experimentStatus;
}
- public ExperimentSummaryModel setExperimentStatus(String experimentStatus) {
+ public void setExperimentStatus(String experimentStatus) {
this.experimentStatus = experimentStatus;
- return this;
}
public void unsetExperimentStatus() {
@@ -458,10 +481,9 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return this.statusUpdateTime;
}
- public ExperimentSummaryModel setStatusUpdateTime(long statusUpdateTime) {
+ public void setStatusUpdateTime(long statusUpdateTime) {
this.statusUpdateTime = statusUpdateTime;
setStatusUpdateTimeIsSet(true);
- return this;
}
public void unsetStatusUpdateTime() {
@@ -907,11 +929,11 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return _Fields.findByThriftId(fieldId);
}
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@@ -1005,30 +1027,35 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (experimentId == null) {
- throw new TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
+ if (!isSetExperimentId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' is unset! Struct:" + toString());
}
- if (projectId == null) {
- throw new TProtocolException("Required field 'projectId' was not present! Struct: " + toString());
+
+ if (!isSetProjectId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'projectId' is unset! Struct:" + toString());
}
- if (gatewayId == null) {
- throw new TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
+
+ if (!isSetGatewayId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
}
- if (userName == null) {
- throw new TProtocolException("Required field 'userName' was not present! Struct: " + toString());
+
+ if (!isSetUserName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
}
- if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
+
+ if (!isSetName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
}
+
// check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1038,7 +1065,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
__isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
- } catch (TException te) {
+ } catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
@@ -1051,7 +1078,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
private static class ExperimentSummaryModelStandardScheme extends StandardScheme<ExperimentSummaryModel> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentSummaryModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -1147,12 +1174,10 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
iprot.readFieldEnd();
}
iprot.readStructEnd();
-
- // check for required fields of primitive type, which can't be checked in the validate method
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentSummaryModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -1227,7 +1252,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
private static class ExperimentSummaryModelTupleScheme extends TupleScheme<ExperimentSummaryModel> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
oprot.writeString(struct.projectId);
@@ -1269,7 +1294,7 @@ public class ExperimentSummaryModel implements org.apache.thrift.TBase<Experimen
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, ExperimentSummaryModel struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 2315ee3..08e798c 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 21c5e74..4607d89 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,17 +51,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");
private static final org.apache.thrift.protocol.TField JOB_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)2);
- 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)3);
- private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)4);
- private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_CONSUMED_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceConsumed", org.apache.thrift.protocol.TType.STRING, (short)7);
- private static final org.apache.thrift.protocol.TField JOB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("jobName", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final org.apache.thrift.protocol.TField WORKING_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("workingDir", org.apache.thrift.protocol.TType.STRING, (short)9);
+ private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField JOB_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("jobDescription", org.apache.thrift.protocol.TType.STRING, (short)3);
+ 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)4);
+ private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatus", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+ private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_CONSUMED_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceConsumed", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField JOB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("jobName", org.apache.thrift.protocol.TType.STRING, (short)7);
+ private static final org.apache.thrift.protocol.TField WORKING_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("workingDir", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -70,6 +71,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
private String jobId; // required
+ private String taskId; // required
private String jobDescription; // required
private long creationTime; // optional
private org.apache.airavata.model.status.JobStatus jobStatus; // optional
@@ -80,12 +82,13 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
JOB_ID((short)1, "jobId"),
- JOB_DESCRIPTION((short)2, "jobDescription"),
- CREATION_TIME((short)3, "creationTime"),
- JOB_STATUS((short)4, "jobStatus"),
- COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"),
- JOB_NAME((short)8, "jobName"),
- WORKING_DIR((short)9, "workingDir");
+ TASK_ID((short)2, "taskId"),
+ JOB_DESCRIPTION((short)3, "jobDescription"),
+ CREATION_TIME((short)4, "creationTime"),
+ JOB_STATUS((short)5, "jobStatus"),
+ COMPUTE_RESOURCE_CONSUMED((short)6, "computeResourceConsumed"),
+ JOB_NAME((short)7, "jobName"),
+ WORKING_DIR((short)8, "workingDir");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -102,17 +105,19 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
switch(fieldId) {
case 1: // JOB_ID
return JOB_ID;
- case 2: // JOB_DESCRIPTION
+ case 2: // TASK_ID
+ return TASK_ID;
+ case 3: // JOB_DESCRIPTION
return JOB_DESCRIPTION;
- case 3: // CREATION_TIME
+ case 4: // CREATION_TIME
return CREATION_TIME;
- case 4: // JOB_STATUS
+ case 5: // JOB_STATUS
return JOB_STATUS;
- case 7: // COMPUTE_RESOURCE_CONSUMED
+ case 6: // COMPUTE_RESOURCE_CONSUMED
return COMPUTE_RESOURCE_CONSUMED;
- case 8: // JOB_NAME
+ case 7: // JOB_NAME
return JOB_NAME;
- case 9: // WORKING_DIR
+ case 8: // WORKING_DIR
return WORKING_DIR;
default:
return null;
@@ -162,6 +167,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.JOB_ID, new org.apache.thrift.meta_data.FieldMetaData("jobId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.JOB_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("jobDescription", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("creationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -183,10 +190,12 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
public JobModel(
String jobId,
+ String taskId,
String jobDescription)
{
this();
this.jobId = jobId;
+ this.taskId = taskId;
this.jobDescription = jobDescription;
}
@@ -198,6 +207,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (other.isSetJobId()) {
this.jobId = other.jobId;
}
+ if (other.isSetTaskId()) {
+ this.taskId = other.taskId;
+ }
if (other.isSetJobDescription()) {
this.jobDescription = other.jobDescription;
}
@@ -223,6 +235,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
@Override
public void clear() {
this.jobId = null;
+ this.taskId = null;
this.jobDescription = null;
setCreationTimeIsSet(false);
this.creationTime = 0;
@@ -255,6 +268,29 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
}
+ public String getTaskId() {
+ return this.taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public void unsetTaskId() {
+ this.taskId = null;
+ }
+
+ /** Returns true if field taskId is set (has been assigned a value) and false otherwise */
+ public boolean isSetTaskId() {
+ return this.taskId != null;
+ }
+
+ public void setTaskIdIsSet(boolean value) {
+ if (!value) {
+ this.taskId = null;
+ }
+ }
+
public String getJobDescription() {
return this.jobDescription;
}
@@ -402,6 +438,14 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
break;
+ case TASK_ID:
+ if (value == null) {
+ unsetTaskId();
+ } else {
+ setTaskId((String)value);
+ }
+ break;
+
case JOB_DESCRIPTION:
if (value == null) {
unsetJobDescription();
@@ -458,6 +502,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
case JOB_ID:
return getJobId();
+ case TASK_ID:
+ return getTaskId();
+
case JOB_DESCRIPTION:
return getJobDescription();
@@ -489,6 +536,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
switch (field) {
case JOB_ID:
return isSetJobId();
+ case TASK_ID:
+ return isSetTaskId();
case JOB_DESCRIPTION:
return isSetJobDescription();
case CREATION_TIME:
@@ -527,6 +576,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return false;
}
+ boolean this_present_taskId = true && this.isSetTaskId();
+ boolean that_present_taskId = true && that.isSetTaskId();
+ if (this_present_taskId || that_present_taskId) {
+ if (!(this_present_taskId && that_present_taskId))
+ return false;
+ if (!this.taskId.equals(that.taskId))
+ return false;
+ }
+
boolean this_present_jobDescription = true && this.isSetJobDescription();
boolean that_present_jobDescription = true && that.isSetJobDescription();
if (this_present_jobDescription || that_present_jobDescription) {
@@ -593,6 +651,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (present_jobId)
list.add(jobId);
+ boolean present_taskId = true && (isSetTaskId());
+ list.add(present_taskId);
+ if (present_taskId)
+ list.add(taskId);
+
boolean present_jobDescription = true && (isSetJobDescription());
list.add(present_jobDescription);
if (present_jobDescription)
@@ -644,6 +707,16 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTaskId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetJobDescription()).compareTo(other.isSetJobDescription());
if (lastComparison != 0) {
return lastComparison;
@@ -732,6 +805,14 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
first = false;
if (!first) sb.append(", ");
+ sb.append("taskId:");
+ if (this.taskId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.taskId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("jobDescription:");
if (this.jobDescription == null) {
sb.append("null");
@@ -795,6 +876,10 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobId' is unset! Struct:" + toString());
}
+ if (!isSetTaskId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskId' is unset! Struct:" + toString());
+ }
+
if (!isSetJobDescription()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobDescription' is unset! Struct:" + toString());
}
@@ -849,7 +934,15 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // JOB_DESCRIPTION
+ case 2: // TASK_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.taskId = iprot.readString();
+ struct.setTaskIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // JOB_DESCRIPTION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.jobDescription = iprot.readString();
struct.setJobDescriptionIsSet(true);
@@ -857,7 +950,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // CREATION_TIME
+ case 4: // CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -865,7 +958,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // JOB_STATUS
+ case 5: // JOB_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
struct.jobStatus.read(iprot);
@@ -874,7 +967,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // COMPUTE_RESOURCE_CONSUMED
+ case 6: // COMPUTE_RESOURCE_CONSUMED
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.computeResourceConsumed = iprot.readString();
struct.setComputeResourceConsumedIsSet(true);
@@ -882,7 +975,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // JOB_NAME
+ case 7: // JOB_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.jobName = iprot.readString();
struct.setJobNameIsSet(true);
@@ -890,7 +983,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 9: // WORKING_DIR
+ case 8: // WORKING_DIR
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.workingDir = iprot.readString();
struct.setWorkingDirIsSet(true);
@@ -916,6 +1009,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
oprot.writeString(struct.jobId);
oprot.writeFieldEnd();
}
+ if (struct.taskId != null) {
+ oprot.writeFieldBegin(TASK_ID_FIELD_DESC);
+ oprot.writeString(struct.taskId);
+ oprot.writeFieldEnd();
+ }
if (struct.jobDescription != null) {
oprot.writeFieldBegin(JOB_DESCRIPTION_FIELD_DESC);
oprot.writeString(struct.jobDescription);
@@ -972,6 +1070,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
public void write(org.apache.thrift.protocol.TProtocol prot, JobModel struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.jobId);
+ oprot.writeString(struct.taskId);
oprot.writeString(struct.jobDescription);
BitSet optionals = new BitSet();
if (struct.isSetCreationTime()) {
@@ -1012,6 +1111,8 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.jobId = iprot.readString();
struct.setJobIdIsSet(true);
+ struct.taskId = iprot.readString();
+ struct.setTaskIdIsSet(true);
struct.jobDescription = iprot.readString();
struct.setJobDescriptionIsSet(true);
BitSet incoming = iprot.readBitSet(5);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 be23363..a2375d8 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 5ced6f7..599c2cc 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 c807853..1bd7beb 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 817a79a..03b851f 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4f3eb57..2a7bfc6 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 e6bc73f..ee1db51 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4d1429e..95f9834 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 53e2833..1e67e54 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ddd7a39..59673aa 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 3f039e8..4f2ed69 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
index 8c9cada..6118429 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskSubmitEvent.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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TaskSubmitEvent implements org.apache.thrift.TBase<TaskSubmitEvent, TaskSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
index 6e766c8..7d31cc9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskTerminateEvent.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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TaskTerminateEvent implements org.apache.thrift.TBase<TaskTerminateEvent, TaskTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 407a0f2..582d3b9 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 244fd31..fbb318e 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 3ddc7c0..35524bb 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 780e879..712bc61 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 6896ec2..a333e52 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4b55123..aee590d 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 fe01c79..8c933c2 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ea951a9..8004e76 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* A friendly description of the task, usally used to communicate information to users.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ca555b7..563da06 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;
* taskInternalStore:
* 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 ad3a254..fd6c631 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 d431e0e..39a08be 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 a7cfd40..fa52def 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 108ece3..4fdd074 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");
[02/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/thrift-interface-descriptions/airavata-api/job_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/job_model.thrift b/thrift-interface-descriptions/airavata-api/job_model.thrift
index e34c953..09abcac 100644
--- a/thrift-interface-descriptions/airavata-api/job_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/job_model.thrift
@@ -27,11 +27,12 @@
struct JobModel {
1: required string jobId,
- 2: required string jobDescription,
- 3: optional i64 creationTime,
- 4: optional status_models.JobStatus jobStatus,
- 7: optional string computeResourceConsumed,
- 8: optional string jobName,
- 9: optional string workingDir
+ 2: required string taskId,
+ 3: required string jobDescription,
+ 4: optional i64 creationTime,
+ 5: optional status_models.JobStatus jobStatus,
+ 6: optional string computeResourceConsumed,
+ 7: optional string jobName,
+ 8: optional string workingDir
}
[08/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 c55a0ea..6f1141e 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
@@ -311,7 +311,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param userName
* @param expName
*/
- void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) {
+ void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) {
// Your implementation goes here
printf("searchExperimentsByName\n");
}
@@ -337,7 +337,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperimentsByNameWithPagination\n");
}
@@ -358,7 +358,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param userName
* @param description
*/
- void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) {
+ void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) {
// Your implementation goes here
printf("searchExperimentsByDesc\n");
}
@@ -384,7 +384,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperimentsByDescWithPagination\n");
}
@@ -405,7 +405,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param userName
* @param applicationId
*/
- void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) {
+ void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) {
// Your implementation goes here
printf("searchExperimentsByApplication\n");
}
@@ -431,7 +431,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperimentsByApplicationWithPagination\n");
}
@@ -452,7 +452,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param userName
* @param experimentState
*/
- void searchExperimentsByStatus(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState) {
+ void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState) {
// Your implementation goes here
printf("searchExperimentsByStatus\n");
}
@@ -478,7 +478,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperimentsByStatusWithPagination\n");
}
@@ -502,7 +502,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param fromTime
* @param toTime
*/
- void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) {
+ void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) {
// Your implementation goes here
printf("searchExperimentsByCreationTime\n");
}
@@ -531,7 +531,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) {
+ void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperimentsByCreationTimeWithPagination\n");
}
@@ -557,7 +557,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void searchExperiments(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) {
+ void searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("searchExperiments\n");
}
@@ -576,7 +576,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param fromTime
* @param toTime
*/
- void getExperimentStatistics( ::apache::airavata::model::workspace::experiment::ExperimentStatistics& _return, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) {
+ void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& _return, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) {
// Your implementation goes here
printf("getExperimentStatistics\n");
}
@@ -591,7 +591,7 @@ class AiravataHandler : virtual public AiravataIf {
*
* @param projectId
*/
- void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId) {
+ void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId) {
// Your implementation goes here
printf("getAllExperimentsInProject\n");
}
@@ -611,7 +611,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId, const int32_t limit, const int32_t offset) {
+ void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("getAllExperimentsInProjectWithPagination\n");
}
@@ -629,7 +629,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param gatewayId
* @param userName
*/
- void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& gatewayId, const std::string& userName) {
+ void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName) {
// Your implementation goes here
printf("getAllUserExperiments\n");
}
@@ -652,7 +652,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param limit
* @param offset
*/
- void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) {
+ void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) {
// Your implementation goes here
printf("getAllUserExperimentsWithPagination\n");
}
@@ -695,7 +695,7 @@ class AiravataHandler : virtual public AiravataIf {
* @param gatewayId
* @param experiment
*/
- void createExperiment(std::string& _return, const std::string& gatewayId, const ::apache::airavata::model::workspace::experiment::Experiment& experiment) {
+ void createExperiment(std::string& _return, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment) {
// Your implementation goes here
printf("createExperiment\n");
}
@@ -735,7 +735,7 @@ class AiravataHandler : virtual public AiravataIf {
*
* @param airavataExperimentId
*/
- void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return, const std::string& airavataExperimentId) {
+ void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getExperiment\n");
}
@@ -782,17 +782,17 @@ class AiravataHandler : virtual public AiravataIf {
* @param airavataExperimentId
* @param experiment
*/
- void updateExperiment(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::Experiment& experiment) {
+ void updateExperiment(const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment) {
// Your implementation goes here
printf("updateExperiment\n");
}
- void updateExperimentConfiguration(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration) {
+ void updateExperimentConfiguration(const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration) {
// Your implementation goes here
printf("updateExperimentConfiguration\n");
}
- void updateResourceScheduleing(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling) {
+ void updateResourceScheduleing(const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling) {
// Your implementation goes here
printf("updateResourceScheduleing\n");
}
@@ -864,36 +864,31 @@ class AiravataHandler : virtual public AiravataIf {
printf("launchExperiment\n");
}
- void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return, const std::string& airavataExperimentId) {
+ void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getExperimentStatus\n");
}
- void getExperimentOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& airavataExperimentId) {
+ void getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getExperimentOutputs\n");
}
- void getIntermediateOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& airavataExperimentId) {
+ void getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getIntermediateOutputs\n");
}
- void getJobStatuses(std::map<std::string, ::apache::airavata::model::workspace::experiment::JobStatus> & _return, const std::string& airavataExperimentId) {
+ void getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getJobStatuses\n");
}
- void getJobDetails(std::vector< ::apache::airavata::model::workspace::experiment::JobDetails> & _return, const std::string& airavataExperimentId) {
+ void getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & _return, const std::string& airavataExperimentId) {
// Your implementation goes here
printf("getJobDetails\n");
}
- void getDataTransferDetails(std::vector< ::apache::airavata::model::workspace::experiment::DataTransferDetails> & _return, const std::string& airavataExperimentId) {
- // Your implementation goes here
- printf("getDataTransferDetails\n");
- }
-
/**
* Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
* The client has to subsequently update this configuration if needed and launch the cloned experiment.
@@ -1282,7 +1277,7 @@ class AiravataHandler : virtual public AiravataIf {
*
* @param appInterfaceId
*/
- void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return, const std::string& appInterfaceId) {
+ void getApplicationInputs(std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & _return, const std::string& appInterfaceId) {
// Your implementation goes here
printf("getApplicationInputs\n");
}
@@ -1299,7 +1294,7 @@ class AiravataHandler : virtual public AiravataIf {
*
* @param appInterfaceId
*/
- void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& appInterfaceId) {
+ void getApplicationOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& appInterfaceId) {
// Your implementation goes here
printf("getApplicationOutputs\n");
}
[09/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 25e967d..250e99f 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
@@ -236,7 +236,7 @@ class AiravataIf {
* @param userName
* @param expName
*/
- virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) = 0;
+ virtual void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName) = 0;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -259,7 +259,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& expName, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment name
@@ -277,7 +277,7 @@ class AiravataIf {
* @param userName
* @param description
*/
- virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) = 0;
+ virtual void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description) = 0;
/**
* Search Experiments by experiment name with pagination. Results will be sorted
@@ -300,7 +300,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& description, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by application id
@@ -318,7 +318,7 @@ class AiravataIf {
* @param userName
* @param applicationId
*/
- virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) = 0;
+ virtual void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId) = 0;
/**
* Search Experiments by application id with pagination. Results will be sorted
@@ -341,7 +341,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::string& applicationId, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment status
@@ -359,7 +359,7 @@ class AiravataIf {
* @param userName
* @param experimentState
*/
- virtual void searchExperimentsByStatus(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState) = 0;
+ virtual void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState) = 0;
/**
* Search Experiments by experiment status with pagination. Results will be sorted
@@ -382,7 +382,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const ::apache::airavata::model::status::ExperimentState::type experimentState, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by experiment creation time
@@ -403,7 +403,7 @@ class AiravataIf {
* @param fromTime
* @param toTime
*/
- virtual void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) = 0;
+ virtual void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime) = 0;
/**
* Search Experiments by experiment creation time with pagination. Results will be sorted
@@ -429,7 +429,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const int64_t fromTime, const int64_t toTime, const int32_t limit, const int32_t offset) = 0;
/**
* Search Experiments by using multiple filter criteria with pagination. Results will be sorted
@@ -452,7 +452,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void searchExperiments(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) = 0;
+ virtual void searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset) = 0;
/**
* Get Experiment Statisitics for the given gateway for a specific time period
@@ -468,7 +468,7 @@ class AiravataIf {
* @param fromTime
* @param toTime
*/
- virtual void getExperimentStatistics( ::apache::airavata::model::workspace::experiment::ExperimentStatistics& _return, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) = 0;
+ virtual void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& _return, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime) = 0;
/**
* Get all Experiments within a Project
@@ -480,7 +480,7 @@ class AiravataIf {
*
* @param projectId
*/
- virtual void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId) = 0;
+ virtual void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId) = 0;
/**
* Get all Experiments within project with pagination. Results will be sorted
@@ -497,7 +497,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& projectId, const int32_t limit, const int32_t offset) = 0;
+ virtual void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& projectId, const int32_t limit, const int32_t offset) = 0;
/**
* Get all Experiments by user
@@ -512,7 +512,7 @@ class AiravataIf {
* @param gatewayId
* @param userName
*/
- virtual void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& gatewayId, const std::string& userName) = 0;
+ virtual void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName) = 0;
/**
* Get all Experiments by user pagination. Results will be sorted
@@ -532,7 +532,7 @@ class AiravataIf {
* @param limit
* @param offset
*/
- virtual void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & _return, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
+ virtual void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & _return, const std::string& gatewayId, const std::string& userName, const int32_t limit, const int32_t offset) = 0;
/**
* Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
@@ -572,7 +572,7 @@ class AiravataIf {
* @param gatewayId
* @param experiment
*/
- virtual void createExperiment(std::string& _return, const std::string& gatewayId, const ::apache::airavata::model::workspace::experiment::Experiment& experiment) = 0;
+ virtual void createExperiment(std::string& _return, const std::string& gatewayId, const ::apache::airavata::model::experiment::ExperimentModel& experiment) = 0;
/**
* Fetch previously created experiment metadata.
@@ -609,7 +609,7 @@ class AiravataIf {
*
* @param airavataExperimentId
*/
- virtual void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& _return, const std::string& airavataExperimentId) = 0;
+ virtual void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& _return, const std::string& airavataExperimentId) = 0;
/**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
@@ -653,9 +653,9 @@ class AiravataIf {
* @param airavataExperimentId
* @param experiment
*/
- virtual void updateExperiment(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::Experiment& experiment) = 0;
- virtual void updateExperimentConfiguration(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::UserConfigurationData& userConfiguration) = 0;
- virtual void updateResourceScheduleing(const std::string& airavataExperimentId, const ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& resourceScheduling) = 0;
+ virtual void updateExperiment(const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::ExperimentModel& experiment) = 0;
+ virtual void updateExperimentConfiguration(const std::string& airavataExperimentId, const ::apache::airavata::model::experiment::UserConfigurationDataModel& userConfiguration) = 0;
+ virtual void updateResourceScheduleing(const std::string& airavataExperimentId, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& resourceScheduling) = 0;
/**
* *
@@ -717,12 +717,11 @@ class AiravataIf {
* @param airavataCredStoreToken
*/
virtual void launchExperiment(const std::string& airavataExperimentId, const std::string& airavataCredStoreToken) = 0;
- virtual void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& _return, const std::string& airavataExperimentId) = 0;
- virtual void getExperimentOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& airavataExperimentId) = 0;
- virtual void getIntermediateOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& airavataExperimentId) = 0;
- virtual void getJobStatuses(std::map<std::string, ::apache::airavata::model::workspace::experiment::JobStatus> & _return, const std::string& airavataExperimentId) = 0;
- virtual void getJobDetails(std::vector< ::apache::airavata::model::workspace::experiment::JobDetails> & _return, const std::string& airavataExperimentId) = 0;
- virtual void getDataTransferDetails(std::vector< ::apache::airavata::model::workspace::experiment::DataTransferDetails> & _return, const std::string& airavataExperimentId) = 0;
+ virtual void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const std::string& airavataExperimentId) = 0;
+ virtual void getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& airavataExperimentId) = 0;
+ virtual void getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& airavataExperimentId) = 0;
+ virtual void getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & _return, const std::string& airavataExperimentId) = 0;
+ virtual void getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & _return, const std::string& airavataExperimentId) = 0;
/**
* Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
@@ -1054,7 +1053,7 @@ class AiravataIf {
*
* @param appInterfaceId
*/
- virtual void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
+ virtual void getApplicationInputs(std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
/**
* Fetch the list of Application Outputs.
@@ -1068,7 +1067,7 @@ class AiravataIf {
*
* @param appInterfaceId
*/
- virtual void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
+ virtual void getApplicationOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const std::string& appInterfaceId) = 0;
/**
* Fetch a list of all deployed Compute Hosts for a given application interfaces.
@@ -1866,67 +1865,67 @@ class AiravataNull : virtual public AiravataIf {
void searchProjectsByProjectDescWithPagination(std::vector< ::apache::airavata::model::workspace::Project> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByName(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */) {
+ void searchExperimentsByName(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */) {
return;
}
- void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByNameWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* expName */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByDesc(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */) {
+ void searchExperimentsByDesc(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */) {
return;
}
- void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByDescWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* description */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByApplication(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */) {
+ void searchExperimentsByApplication(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */) {
return;
}
- void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByApplicationWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::string& /* applicationId */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByStatus(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::workspace::experiment::ExperimentState::type /* experimentState */) {
+ void searchExperimentsByStatus(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::status::ExperimentState::type /* experimentState */) {
return;
}
- void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::workspace::experiment::ExperimentState::type /* experimentState */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByStatusWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const ::apache::airavata::model::status::ExperimentState::type /* experimentState */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */) {
+ void searchExperimentsByCreationTime(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */) {
return;
}
- void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperimentsByCreationTimeWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int64_t /* fromTime */, const int64_t /* toTime */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void searchExperiments(std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & /* filters */, const int32_t /* limit */, const int32_t /* offset */) {
+ void searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & /* filters */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void getExperimentStatistics( ::apache::airavata::model::workspace::experiment::ExperimentStatistics& /* _return */, const std::string& /* gatewayId */, const int64_t /* fromTime */, const int64_t /* toTime */) {
+ void getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& /* _return */, const std::string& /* gatewayId */, const int64_t /* fromTime */, const int64_t /* toTime */) {
return;
}
- void getAllExperimentsInProject(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* projectId */) {
+ void getAllExperimentsInProject(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* projectId */) {
return;
}
- void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* projectId */, const int32_t /* limit */, const int32_t /* offset */) {
+ void getAllExperimentsInProjectWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* projectId */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void getAllUserExperiments(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */) {
+ void getAllUserExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */) {
return;
}
- void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int32_t /* limit */, const int32_t /* offset */) {
+ void getAllUserExperimentsWithPagination(std::vector< ::apache::airavata::model::experiment::ExperimentModel> & /* _return */, const std::string& /* gatewayId */, const std::string& /* userName */, const int32_t /* limit */, const int32_t /* offset */) {
return;
}
- void createExperiment(std::string& /* _return */, const std::string& /* gatewayId */, const ::apache::airavata::model::workspace::experiment::Experiment& /* experiment */) {
+ void createExperiment(std::string& /* _return */, const std::string& /* gatewayId */, const ::apache::airavata::model::experiment::ExperimentModel& /* experiment */) {
return;
}
- void getExperiment( ::apache::airavata::model::workspace::experiment::Experiment& /* _return */, const std::string& /* airavataExperimentId */) {
+ void getExperiment( ::apache::airavata::model::experiment::ExperimentModel& /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
- void updateExperiment(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::workspace::experiment::Experiment& /* experiment */) {
+ void updateExperiment(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::experiment::ExperimentModel& /* experiment */) {
return;
}
- void updateExperimentConfiguration(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::workspace::experiment::UserConfigurationData& /* userConfiguration */) {
+ void updateExperimentConfiguration(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::experiment::UserConfigurationDataModel& /* userConfiguration */) {
return;
}
- void updateResourceScheduleing(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::workspace::experiment::ComputationalResourceScheduling& /* resourceScheduling */) {
+ void updateResourceScheduleing(const std::string& /* airavataExperimentId */, const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& /* resourceScheduling */) {
return;
}
bool validateExperiment(const std::string& /* airavataExperimentId */) {
@@ -1936,22 +1935,19 @@ class AiravataNull : virtual public AiravataIf {
void launchExperiment(const std::string& /* airavataExperimentId */, const std::string& /* airavataCredStoreToken */) {
return;
}
- void getExperimentStatus( ::apache::airavata::model::workspace::experiment::ExperimentStatus& /* _return */, const std::string& /* airavataExperimentId */) {
+ void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
- void getExperimentOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
+ void getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
- void getIntermediateOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
+ void getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
- void getJobStatuses(std::map<std::string, ::apache::airavata::model::workspace::experiment::JobStatus> & /* _return */, const std::string& /* airavataExperimentId */) {
+ void getJobStatuses(std::map<std::string, ::apache::airavata::model::status::JobStatus> & /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
- void getJobDetails(std::vector< ::apache::airavata::model::workspace::experiment::JobDetails> & /* _return */, const std::string& /* airavataExperimentId */) {
- return;
- }
- void getDataTransferDetails(std::vector< ::apache::airavata::model::workspace::experiment::DataTransferDetails> & /* _return */, const std::string& /* airavataExperimentId */) {
+ void getJobDetails(std::vector< ::apache::airavata::model::job::JobModel> & /* _return */, const std::string& /* airavataExperimentId */) {
return;
}
void cloneExperiment(std::string& /* _return */, const std::string& /* existingExperimentID */, const std::string& /* newExperimentName */) {
@@ -2017,10 +2013,10 @@ class AiravataNull : virtual public AiravataIf {
void getAllApplicationInterfaces(std::vector< ::apache::airavata::model::appcatalog::appinterface::ApplicationInterfaceDescription> & /* _return */, const std::string& /* gatewayId */) {
return;
}
- void getApplicationInputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::InputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
+ void getApplicationInputs(std::vector< ::apache::airavata::model::application::io::InputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
return;
}
- void getApplicationOutputs(std::vector< ::apache::airavata::model::appcatalog::appinterface::OutputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
+ void getApplicationOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & /* _return */, const std::string& /* appInterfaceId */) {
return;
}
void getAvailableAppInterfaceComputeResources(std::map<std::string, std::string> & /* _return */, const std::string& /* appInterfaceId */) {
@@ -5188,8 +5184,8 @@ typedef struct _Airavata_searchExperimentsByName_result__isset {
class Airavata_searchExperimentsByName_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByName_result(const Airavata_searchExperimentsByName_result&);
Airavata_searchExperimentsByName_result& operator=(const Airavata_searchExperimentsByName_result&);
@@ -5197,14 +5193,14 @@ class Airavata_searchExperimentsByName_result {
}
virtual ~Airavata_searchExperimentsByName_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByName_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5247,12 +5243,12 @@ typedef struct _Airavata_searchExperimentsByName_presult__isset {
class Airavata_searchExperimentsByName_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByName_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -5350,8 +5346,8 @@ typedef struct _Airavata_searchExperimentsByNameWithPagination_result__isset {
class Airavata_searchExperimentsByNameWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByNameWithPagination_result(const Airavata_searchExperimentsByNameWithPagination_result&);
Airavata_searchExperimentsByNameWithPagination_result& operator=(const Airavata_searchExperimentsByNameWithPagination_result&);
@@ -5359,14 +5355,14 @@ class Airavata_searchExperimentsByNameWithPagination_result {
}
virtual ~Airavata_searchExperimentsByNameWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByNameWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5409,12 +5405,12 @@ typedef struct _Airavata_searchExperimentsByNameWithPagination_presult__isset {
class Airavata_searchExperimentsByNameWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByNameWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -5500,8 +5496,8 @@ typedef struct _Airavata_searchExperimentsByDesc_result__isset {
class Airavata_searchExperimentsByDesc_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByDesc_result(const Airavata_searchExperimentsByDesc_result&);
Airavata_searchExperimentsByDesc_result& operator=(const Airavata_searchExperimentsByDesc_result&);
@@ -5509,14 +5505,14 @@ class Airavata_searchExperimentsByDesc_result {
}
virtual ~Airavata_searchExperimentsByDesc_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByDesc_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5559,12 +5555,12 @@ typedef struct _Airavata_searchExperimentsByDesc_presult__isset {
class Airavata_searchExperimentsByDesc_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByDesc_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -5662,8 +5658,8 @@ typedef struct _Airavata_searchExperimentsByDescWithPagination_result__isset {
class Airavata_searchExperimentsByDescWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByDescWithPagination_result(const Airavata_searchExperimentsByDescWithPagination_result&);
Airavata_searchExperimentsByDescWithPagination_result& operator=(const Airavata_searchExperimentsByDescWithPagination_result&);
@@ -5671,14 +5667,14 @@ class Airavata_searchExperimentsByDescWithPagination_result {
}
virtual ~Airavata_searchExperimentsByDescWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByDescWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5721,12 +5717,12 @@ typedef struct _Airavata_searchExperimentsByDescWithPagination_presult__isset {
class Airavata_searchExperimentsByDescWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByDescWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -5812,8 +5808,8 @@ typedef struct _Airavata_searchExperimentsByApplication_result__isset {
class Airavata_searchExperimentsByApplication_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByApplication_result(const Airavata_searchExperimentsByApplication_result&);
Airavata_searchExperimentsByApplication_result& operator=(const Airavata_searchExperimentsByApplication_result&);
@@ -5821,14 +5817,14 @@ class Airavata_searchExperimentsByApplication_result {
}
virtual ~Airavata_searchExperimentsByApplication_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByApplication_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -5871,12 +5867,12 @@ typedef struct _Airavata_searchExperimentsByApplication_presult__isset {
class Airavata_searchExperimentsByApplication_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByApplication_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -5974,8 +5970,8 @@ typedef struct _Airavata_searchExperimentsByApplicationWithPagination_result__is
class Airavata_searchExperimentsByApplicationWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByApplicationWithPagination_result(const Airavata_searchExperimentsByApplicationWithPagination_result&);
Airavata_searchExperimentsByApplicationWithPagination_result& operator=(const Airavata_searchExperimentsByApplicationWithPagination_result&);
@@ -5983,14 +5979,14 @@ class Airavata_searchExperimentsByApplicationWithPagination_result {
}
virtual ~Airavata_searchExperimentsByApplicationWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByApplicationWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6033,12 +6029,12 @@ typedef struct _Airavata_searchExperimentsByApplicationWithPagination_presult__i
class Airavata_searchExperimentsByApplicationWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByApplicationWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6059,19 +6055,19 @@ class Airavata_searchExperimentsByStatus_args {
Airavata_searchExperimentsByStatus_args(const Airavata_searchExperimentsByStatus_args&);
Airavata_searchExperimentsByStatus_args& operator=(const Airavata_searchExperimentsByStatus_args&);
- Airavata_searchExperimentsByStatus_args() : gatewayId(), userName(), experimentState(( ::apache::airavata::model::workspace::experiment::ExperimentState::type)0) {
+ Airavata_searchExperimentsByStatus_args() : gatewayId(), userName(), experimentState(( ::apache::airavata::model::status::ExperimentState::type)0) {
}
virtual ~Airavata_searchExperimentsByStatus_args() throw();
std::string gatewayId;
std::string userName;
- ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState;
+ ::apache::airavata::model::status::ExperimentState::type experimentState;
void __set_gatewayId(const std::string& val);
void __set_userName(const std::string& val);
- void __set_experimentState(const ::apache::airavata::model::workspace::experiment::ExperimentState::type val);
+ void __set_experimentState(const ::apache::airavata::model::status::ExperimentState::type val);
bool operator == (const Airavata_searchExperimentsByStatus_args & rhs) const
{
@@ -6106,7 +6102,7 @@ class Airavata_searchExperimentsByStatus_pargs {
virtual ~Airavata_searchExperimentsByStatus_pargs() throw();
const std::string* gatewayId;
const std::string* userName;
- const ::apache::airavata::model::workspace::experiment::ExperimentState::type* experimentState;
+ const ::apache::airavata::model::status::ExperimentState::type* experimentState;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -6124,8 +6120,8 @@ typedef struct _Airavata_searchExperimentsByStatus_result__isset {
class Airavata_searchExperimentsByStatus_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByStatus_result(const Airavata_searchExperimentsByStatus_result&);
Airavata_searchExperimentsByStatus_result& operator=(const Airavata_searchExperimentsByStatus_result&);
@@ -6133,14 +6129,14 @@ class Airavata_searchExperimentsByStatus_result {
}
virtual ~Airavata_searchExperimentsByStatus_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByStatus_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6183,12 +6179,12 @@ typedef struct _Airavata_searchExperimentsByStatus_presult__isset {
class Airavata_searchExperimentsByStatus_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByStatus_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6209,13 +6205,13 @@ class Airavata_searchExperimentsByStatusWithPagination_args {
Airavata_searchExperimentsByStatusWithPagination_args(const Airavata_searchExperimentsByStatusWithPagination_args&);
Airavata_searchExperimentsByStatusWithPagination_args& operator=(const Airavata_searchExperimentsByStatusWithPagination_args&);
- Airavata_searchExperimentsByStatusWithPagination_args() : gatewayId(), userName(), experimentState(( ::apache::airavata::model::workspace::experiment::ExperimentState::type)0), limit(0), offset(0) {
+ Airavata_searchExperimentsByStatusWithPagination_args() : gatewayId(), userName(), experimentState(( ::apache::airavata::model::status::ExperimentState::type)0), limit(0), offset(0) {
}
virtual ~Airavata_searchExperimentsByStatusWithPagination_args() throw();
std::string gatewayId;
std::string userName;
- ::apache::airavata::model::workspace::experiment::ExperimentState::type experimentState;
+ ::apache::airavata::model::status::ExperimentState::type experimentState;
int32_t limit;
int32_t offset;
@@ -6223,7 +6219,7 @@ class Airavata_searchExperimentsByStatusWithPagination_args {
void __set_userName(const std::string& val);
- void __set_experimentState(const ::apache::airavata::model::workspace::experiment::ExperimentState::type val);
+ void __set_experimentState(const ::apache::airavata::model::status::ExperimentState::type val);
void __set_limit(const int32_t val);
@@ -6266,7 +6262,7 @@ class Airavata_searchExperimentsByStatusWithPagination_pargs {
virtual ~Airavata_searchExperimentsByStatusWithPagination_pargs() throw();
const std::string* gatewayId;
const std::string* userName;
- const ::apache::airavata::model::workspace::experiment::ExperimentState::type* experimentState;
+ const ::apache::airavata::model::status::ExperimentState::type* experimentState;
const int32_t* limit;
const int32_t* offset;
@@ -6286,8 +6282,8 @@ typedef struct _Airavata_searchExperimentsByStatusWithPagination_result__isset {
class Airavata_searchExperimentsByStatusWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByStatusWithPagination_result(const Airavata_searchExperimentsByStatusWithPagination_result&);
Airavata_searchExperimentsByStatusWithPagination_result& operator=(const Airavata_searchExperimentsByStatusWithPagination_result&);
@@ -6295,14 +6291,14 @@ class Airavata_searchExperimentsByStatusWithPagination_result {
}
virtual ~Airavata_searchExperimentsByStatusWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByStatusWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6345,12 +6341,12 @@ typedef struct _Airavata_searchExperimentsByStatusWithPagination_presult__isset
class Airavata_searchExperimentsByStatusWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByStatusWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6442,8 +6438,8 @@ typedef struct _Airavata_searchExperimentsByCreationTime_result__isset {
class Airavata_searchExperimentsByCreationTime_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByCreationTime_result(const Airavata_searchExperimentsByCreationTime_result&);
Airavata_searchExperimentsByCreationTime_result& operator=(const Airavata_searchExperimentsByCreationTime_result&);
@@ -6451,14 +6447,14 @@ class Airavata_searchExperimentsByCreationTime_result {
}
virtual ~Airavata_searchExperimentsByCreationTime_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByCreationTime_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6501,12 +6497,12 @@ typedef struct _Airavata_searchExperimentsByCreationTime_presult__isset {
class Airavata_searchExperimentsByCreationTime_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByCreationTime_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6610,8 +6606,8 @@ typedef struct _Airavata_searchExperimentsByCreationTimeWithPagination_result__i
class Airavata_searchExperimentsByCreationTimeWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperimentsByCreationTimeWithPagination_result(const Airavata_searchExperimentsByCreationTimeWithPagination_result&);
Airavata_searchExperimentsByCreationTimeWithPagination_result& operator=(const Airavata_searchExperimentsByCreationTimeWithPagination_result&);
@@ -6619,14 +6615,14 @@ class Airavata_searchExperimentsByCreationTimeWithPagination_result {
}
virtual ~Airavata_searchExperimentsByCreationTimeWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperimentsByCreationTimeWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6669,12 +6665,12 @@ typedef struct _Airavata_searchExperimentsByCreationTimeWithPagination_presult__
class Airavata_searchExperimentsByCreationTimeWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperimentsByCreationTimeWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6705,7 +6701,7 @@ class Airavata_searchExperiments_args {
virtual ~Airavata_searchExperiments_args() throw();
std::string gatewayId;
std::string userName;
- std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> filters;
+ std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> filters;
int32_t limit;
int32_t offset;
@@ -6715,7 +6711,7 @@ class Airavata_searchExperiments_args {
void __set_userName(const std::string& val);
- void __set_filters(const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> & val);
+ void __set_filters(const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & val);
void __set_limit(const int32_t val);
@@ -6758,7 +6754,7 @@ class Airavata_searchExperiments_pargs {
virtual ~Airavata_searchExperiments_pargs() throw();
const std::string* gatewayId;
const std::string* userName;
- const std::map< ::apache::airavata::model::workspace::experiment::ExperimentSearchFields::type, std::string> * filters;
+ const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> * filters;
const int32_t* limit;
const int32_t* offset;
@@ -6778,8 +6774,8 @@ typedef struct _Airavata_searchExperiments_result__isset {
class Airavata_searchExperiments_result {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
Airavata_searchExperiments_result(const Airavata_searchExperiments_result&);
Airavata_searchExperiments_result& operator=(const Airavata_searchExperiments_result&);
@@ -6787,14 +6783,14 @@ class Airavata_searchExperiments_result {
}
virtual ~Airavata_searchExperiments_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_searchExperiments_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6837,12 +6833,12 @@ typedef struct _Airavata_searchExperiments_presult__isset {
class Airavata_searchExperiments_presult {
public:
- static const char* ascii_fingerprint; // = "C4BC78CA92A32303D61DFDF7263A04B3";
- static const uint8_t binary_fingerprint[16]; // = {0xC4,0xBC,0x78,0xCA,0x92,0xA3,0x23,0x03,0xD6,0x1D,0xFD,0xF7,0x26,0x3A,0x04,0xB3};
+ static const char* ascii_fingerprint; // = "7001B7B9289164CB898AF0E0F4E6EE4A";
+ static const uint8_t binary_fingerprint[16]; // = {0x70,0x01,0xB7,0xB9,0x28,0x91,0x64,0xCB,0x89,0x8A,0xF0,0xE0,0xF4,0xE6,0xEE,0x4A};
virtual ~Airavata_searchExperiments_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::ExperimentSummary> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -6928,8 +6924,8 @@ typedef struct _Airavata_getExperimentStatistics_result__isset {
class Airavata_getExperimentStatistics_result {
public:
- static const char* ascii_fingerprint; // = "2C9764D6E86121F49BB9E1CCECEAFE39";
- static const uint8_t binary_fingerprint[16]; // = {0x2C,0x97,0x64,0xD6,0xE8,0x61,0x21,0xF4,0x9B,0xB9,0xE1,0xCC,0xEC,0xEA,0xFE,0x39};
+ static const char* ascii_fingerprint; // = "273BA5B71C4B86001CF63C2B2FE6CEA4";
+ static const uint8_t binary_fingerprint[16]; // = {0x27,0x3B,0xA5,0xB7,0x1C,0x4B,0x86,0x00,0x1C,0xF6,0x3C,0x2B,0x2F,0xE6,0xCE,0xA4};
Airavata_getExperimentStatistics_result(const Airavata_getExperimentStatistics_result&);
Airavata_getExperimentStatistics_result& operator=(const Airavata_getExperimentStatistics_result&);
@@ -6937,14 +6933,14 @@ class Airavata_getExperimentStatistics_result {
}
virtual ~Airavata_getExperimentStatistics_result() throw();
- ::apache::airavata::model::workspace::experiment::ExperimentStatistics success;
+ ::apache::airavata::model::experiment::ExperimentStatistics success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_getExperimentStatistics_result__isset __isset;
- void __set_success(const ::apache::airavata::model::workspace::experiment::ExperimentStatistics& val);
+ void __set_success(const ::apache::airavata::model::experiment::ExperimentStatistics& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -6987,12 +6983,12 @@ typedef struct _Airavata_getExperimentStatistics_presult__isset {
class Airavata_getExperimentStatistics_presult {
public:
- static const char* ascii_fingerprint; // = "2C9764D6E86121F49BB9E1CCECEAFE39";
- static const uint8_t binary_fingerprint[16]; // = {0x2C,0x97,0x64,0xD6,0xE8,0x61,0x21,0xF4,0x9B,0xB9,0xE1,0xCC,0xEC,0xEA,0xFE,0x39};
+ static const char* ascii_fingerprint; // = "273BA5B71C4B86001CF63C2B2FE6CEA4";
+ static const uint8_t binary_fingerprint[16]; // = {0x27,0x3B,0xA5,0xB7,0x1C,0x4B,0x86,0x00,0x1C,0xF6,0x3C,0x2B,0x2F,0xE6,0xCE,0xA4};
virtual ~Airavata_getExperimentStatistics_presult() throw();
- ::apache::airavata::model::workspace::experiment::ExperimentStatistics* success;
+ ::apache::airavata::model::experiment::ExperimentStatistics* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7067,8 +7063,8 @@ typedef struct _Airavata_getAllExperimentsInProject_result__isset {
class Airavata_getAllExperimentsInProject_result {
public:
- static const char* ascii_fingerprint; // = "41576D99B3DCFAAD6CAD4D6AB133DFE2";
- static const uint8_t binary_fingerprint[16]; // = {0x41,0x57,0x6D,0x99,0xB3,0xDC,0xFA,0xAD,0x6C,0xAD,0x4D,0x6A,0xB1,0x33,0xDF,0xE2};
+ static const char* ascii_fingerprint; // = "6B4769CBA7068AF3BD2B200CE0A4C648";
+ static const uint8_t binary_fingerprint[16]; // = {0x6B,0x47,0x69,0xCB,0xA7,0x06,0x8A,0xF3,0xBD,0x2B,0x20,0x0C,0xE0,0xA4,0xC6,0x48};
Airavata_getAllExperimentsInProject_result(const Airavata_getAllExperimentsInProject_result&);
Airavata_getAllExperimentsInProject_result& operator=(const Airavata_getAllExperimentsInProject_result&);
@@ -7076,7 +7072,7 @@ class Airavata_getAllExperimentsInProject_result {
}
virtual ~Airavata_getAllExperimentsInProject_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7084,7 +7080,7 @@ class Airavata_getAllExperimentsInProject_result {
_Airavata_getAllExperimentsInProject_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7132,12 +7128,12 @@ typedef struct _Airavata_getAllExperimentsInProject_presult__isset {
class Airavata_getAllExperimentsInProject_presult {
public:
- static const char* ascii_fingerprint; // = "41576D99B3DCFAAD6CAD4D6AB133DFE2";
- static const uint8_t binary_fingerprint[16]; // = {0x41,0x57,0x6D,0x99,0xB3,0xDC,0xFA,0xAD,0x6C,0xAD,0x4D,0x6A,0xB1,0x33,0xDF,0xE2};
+ static const char* ascii_fingerprint; // = "6B4769CBA7068AF3BD2B200CE0A4C648";
+ static const uint8_t binary_fingerprint[16]; // = {0x6B,0x47,0x69,0xCB,0xA7,0x06,0x8A,0xF3,0xBD,0x2B,0x20,0x0C,0xE0,0xA4,0xC6,0x48};
virtual ~Airavata_getAllExperimentsInProject_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7225,8 +7221,8 @@ typedef struct _Airavata_getAllExperimentsInProjectWithPagination_result__isset
class Airavata_getAllExperimentsInProjectWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "41576D99B3DCFAAD6CAD4D6AB133DFE2";
- static const uint8_t binary_fingerprint[16]; // = {0x41,0x57,0x6D,0x99,0xB3,0xDC,0xFA,0xAD,0x6C,0xAD,0x4D,0x6A,0xB1,0x33,0xDF,0xE2};
+ static const char* ascii_fingerprint; // = "6B4769CBA7068AF3BD2B200CE0A4C648";
+ static const uint8_t binary_fingerprint[16]; // = {0x6B,0x47,0x69,0xCB,0xA7,0x06,0x8A,0xF3,0xBD,0x2B,0x20,0x0C,0xE0,0xA4,0xC6,0x48};
Airavata_getAllExperimentsInProjectWithPagination_result(const Airavata_getAllExperimentsInProjectWithPagination_result&);
Airavata_getAllExperimentsInProjectWithPagination_result& operator=(const Airavata_getAllExperimentsInProjectWithPagination_result&);
@@ -7234,7 +7230,7 @@ class Airavata_getAllExperimentsInProjectWithPagination_result {
}
virtual ~Airavata_getAllExperimentsInProjectWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7242,7 +7238,7 @@ class Airavata_getAllExperimentsInProjectWithPagination_result {
_Airavata_getAllExperimentsInProjectWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7290,12 +7286,12 @@ typedef struct _Airavata_getAllExperimentsInProjectWithPagination_presult__isset
class Airavata_getAllExperimentsInProjectWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "41576D99B3DCFAAD6CAD4D6AB133DFE2";
- static const uint8_t binary_fingerprint[16]; // = {0x41,0x57,0x6D,0x99,0xB3,0xDC,0xFA,0xAD,0x6C,0xAD,0x4D,0x6A,0xB1,0x33,0xDF,0xE2};
+ static const char* ascii_fingerprint; // = "6B4769CBA7068AF3BD2B200CE0A4C648";
+ static const uint8_t binary_fingerprint[16]; // = {0x6B,0x47,0x69,0xCB,0xA7,0x06,0x8A,0xF3,0xBD,0x2B,0x20,0x0C,0xE0,0xA4,0xC6,0x48};
virtual ~Airavata_getAllExperimentsInProjectWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7376,8 +7372,8 @@ typedef struct _Airavata_getAllUserExperiments_result__isset {
class Airavata_getAllUserExperiments_result {
public:
- static const char* ascii_fingerprint; // = "604785897417B94CC709253F2B52CB8D";
- static const uint8_t binary_fingerprint[16]; // = {0x60,0x47,0x85,0x89,0x74,0x17,0xB9,0x4C,0xC7,0x09,0x25,0x3F,0x2B,0x52,0xCB,0x8D};
+ static const char* ascii_fingerprint; // = "7F8F5E54F1D3996A9D4B47B330B0655D";
+ static const uint8_t binary_fingerprint[16]; // = {0x7F,0x8F,0x5E,0x54,0xF1,0xD3,0x99,0x6A,0x9D,0x4B,0x47,0xB3,0x30,0xB0,0x65,0x5D};
Airavata_getAllUserExperiments_result(const Airavata_getAllUserExperiments_result&);
Airavata_getAllUserExperiments_result& operator=(const Airavata_getAllUserExperiments_result&);
@@ -7385,14 +7381,14 @@ class Airavata_getAllUserExperiments_result {
}
virtual ~Airavata_getAllUserExperiments_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_getAllUserExperiments_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7435,12 +7431,12 @@ typedef struct _Airavata_getAllUserExperiments_presult__isset {
class Airavata_getAllUserExperiments_presult {
public:
- static const char* ascii_fingerprint; // = "604785897417B94CC709253F2B52CB8D";
- static const uint8_t binary_fingerprint[16]; // = {0x60,0x47,0x85,0x89,0x74,0x17,0xB9,0x4C,0xC7,0x09,0x25,0x3F,0x2B,0x52,0xCB,0x8D};
+ static const char* ascii_fingerprint; // = "7F8F5E54F1D3996A9D4B47B330B0655D";
+ static const uint8_t binary_fingerprint[16]; // = {0x7F,0x8F,0x5E,0x54,0xF1,0xD3,0x99,0x6A,0x9D,0x4B,0x47,0xB3,0x30,0xB0,0x65,0x5D};
virtual ~Airavata_getAllUserExperiments_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7532,8 +7528,8 @@ typedef struct _Airavata_getAllUserExperimentsWithPagination_result__isset {
class Airavata_getAllUserExperimentsWithPagination_result {
public:
- static const char* ascii_fingerprint; // = "604785897417B94CC709253F2B52CB8D";
- static const uint8_t binary_fingerprint[16]; // = {0x60,0x47,0x85,0x89,0x74,0x17,0xB9,0x4C,0xC7,0x09,0x25,0x3F,0x2B,0x52,0xCB,0x8D};
+ static const char* ascii_fingerprint; // = "7F8F5E54F1D3996A9D4B47B330B0655D";
+ static const uint8_t binary_fingerprint[16]; // = {0x7F,0x8F,0x5E,0x54,0xF1,0xD3,0x99,0x6A,0x9D,0x4B,0x47,0xB3,0x30,0xB0,0x65,0x5D};
Airavata_getAllUserExperimentsWithPagination_result(const Airavata_getAllUserExperimentsWithPagination_result&);
Airavata_getAllUserExperimentsWithPagination_result& operator=(const Airavata_getAllUserExperimentsWithPagination_result&);
@@ -7541,14 +7537,14 @@ class Airavata_getAllUserExperimentsWithPagination_result {
}
virtual ~Airavata_getAllUserExperimentsWithPagination_result() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
_Airavata_getAllUserExperimentsWithPagination_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::workspace::experiment::Experiment> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::experiment::ExperimentModel> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7591,12 +7587,12 @@ typedef struct _Airavata_getAllUserExperimentsWithPagination_presult__isset {
class Airavata_getAllUserExperimentsWithPagination_presult {
public:
- static const char* ascii_fingerprint; // = "604785897417B94CC709253F2B52CB8D";
- static const uint8_t binary_fingerprint[16]; // = {0x60,0x47,0x85,0x89,0x74,0x17,0xB9,0x4C,0xC7,0x09,0x25,0x3F,0x2B,0x52,0xCB,0x8D};
+ static const char* ascii_fingerprint; // = "7F8F5E54F1D3996A9D4B47B330B0655D";
+ static const uint8_t binary_fingerprint[16]; // = {0x7F,0x8F,0x5E,0x54,0xF1,0xD3,0x99,0x6A,0x9D,0x4B,0x47,0xB3,0x30,0xB0,0x65,0x5D};
virtual ~Airavata_getAllUserExperimentsWithPagination_presult() throw();
- std::vector< ::apache::airavata::model::workspace::experiment::Experiment> * success;
+ std::vector< ::apache::airavata::model::experiment::ExperimentModel> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -7612,8 +7608,8 @@ class Airavata_getAllUserExperimentsWithPagination_presult {
class Airavata_createExperiment_args {
public:
- static const char* ascii_fingerprint; // = "C58FE3632FD229B69FCF3D7C3CF5C880";
- static const uint8_t binary_fingerprint[16]; // = {0xC5,0x8F,0xE3,0x63,0x2F,0xD2,0x29,0xB6,0x9F,0xCF,0x3D,0x7C,0x3C,0xF5,0xC8,0x80};
+ static const char* ascii_fingerprint; // = "F1584918A7370E4CF77D731E4B386990";
+ static const uint8_t binary_fingerprint[16]; // = {0xF1,0x58,0x49,0x18,0xA7,0x37,0x0E,0x4C,0xF7,0x7D,0x73,0x1E,0x4B,0x38,0x69,0x90};
Airavata_createExperiment_args(const Airavata_createExperiment_args&);
Airavata_createExperiment_args& operator=(const Airavata_createExperiment_args&);
@@ -7622,11 +7618,11 @@ class Airavata_createExperiment_args {
virtual ~Airavata_createExperiment_args() throw();
std::string gatewayId;
- ::apache::airavata::model::workspace::experiment::Experiment experiment;
+ ::apache::airavata::model::experiment::ExperimentModel experiment;
void __set_gatewayId(const std::string& val);
- void __set_experiment(const ::apache::airavata::model::workspace::experiment::Experiment& val);
+ void __set_experiment(const ::apache::airavata::model::experiment::ExperimentModel& val);
bool operator == (const Airavata_createExperiment_args & rhs) const
{
@@ -7652,13 +7648,13 @@ class Airavata_createExperiment_args {
class Airavata_createExperiment_pargs {
public:
- static const char* ascii_fingerprint; // = "C58FE3632FD229B69FCF3D7C3CF5C880";
- static const uint8_t binary_fingerprint[16]; // = {0xC5,0x8F,0xE3,0x63,0x2F,0xD2,0x29,0xB6,0x9F,0xCF,0x3D,0x7C,0x3C,0xF5,0xC8,0x80};
+ static const char* ascii_fingerprint; // = "F1584918A7370E4CF77D731E4B386990";
+ static const uint8_t binary_fingerprint[16]; // = {0xF1,0x58,0x49,0x18,0xA7,0x37,0x0E,0x4C,0xF7,0x7D,0x73,0x1E,0x4B,0x38,0x69,0x90};
virtual ~Airavata_createExperiment_pargs() throw();
const std::string* gatewayId;
- const ::apache::airavata::model::workspace::experiment::Experiment* experiment;
+ const ::apache::airavata::model::experiment::ExperimentModel* experiment;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -7815,8 +7811,8 @@ typedef struct _Airavata_getExperiment_result__isset {
class Airavata_getExperiment_result {
public:
- static const char* ascii_fingerprint; // = "E5C7F34D41DEE2D37F02D64EA9EE7C04";
- static const uint8_t binary_fingerprint[16]; // = {0xE5,0xC7,0xF3,0x4D,0x41,0xDE,0xE2,0xD3,0x7F,0x02,0xD6,0x4E,0xA9,0xEE,0x7C,0x04};
+ static const char* ascii_fingerprint; // = "B32084B61EFF58B48AE85AFCA19D92D5";
+ static const uint8_t binary_fingerprint[16]; // = {0xB3,0x20,0x84,0xB6,0x1E,0xFF,0x58,0xB4,0x8A,0xE8,0x5A,0xFC,0xA1,0x9D,0x92,0xD5};
Airavata_getExperiment_result(const Airavata_getExperiment_result&);
Airavata_getExperiment_result& operator=(const Airavata_getExperiment_result&);
@@ -7824,7 +7820,7 @@ class Airavata_getExperiment_result {
}
virtual ~Airavata_getExperiment_result() throw();
- ::apache::airavata::model::workspace::experiment::Experiment success;
+ ::apache::airavata::model::experiment::ExperimentModel success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::ExperimentNotFoundException enf;
::apache::airavata::api::error::AiravataClientException ace;
@@ -7832,7 +7828,7 @@ class Airavata_getExperiment_result {
_Airavata_getExperiment_result__isset __isset;
- void __set_success(const ::apache::airavata::model::workspace::experiment::Experiment& val);
+ void __set_success(const ::apache::airavata::model::experiment::ExperimentModel& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -7880,12 +7876,12 @@ typedef struct _Airavata_getExperiment_presult__isset {
class Airavata_getExperiment_presult {
public:
- static const char* ascii_fingerprint; // = "E5C7F34D41DEE2D37F02D64EA9EE7C04";
- static const uint8_t binary_fingerprint[16]; // = {0xE5,0xC7,0xF3,0x4D,0x41,0xDE,0xE2,0xD3,0x7F,0x02,0xD6,0x4E,0xA9,0xEE,0x7C,0x04};
+ static const char* ascii_fingerprint; // = "B32084B61EFF58B48AE85AFCA19D92D5";
+ static const uint8_t binary_fingerprint[16]; // = {0xB3,0x20,0x84,0xB6,0x1E,0xFF,0x58,0xB4,0x8A,0xE8,0x5A,0xFC,0xA1,0x9D,0x92,0xD5};
virtual ~Airavata_getExperiment_presult() throw();
- ::apache::airavata::model::workspace::experiment::Experiment* success;
+ ::apache::airavata::model::experiment::ExperimentModel* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::ExperimentNotFoundException enf;
::apache::airavata::api::error::AiravataClientException ace;
@@ -7902,8 +7898,8 @@ class Airavata_getExperiment_presult {
class Airavata_updateExperiment_args {
public:
- static const char* ascii_fingerprint; // = "C58FE3632FD229B69FCF3D7C3CF5C880";
- static const uint8_t binary_fingerprint[16]; // = {0xC5,0x8F,0xE3,0x63,0x2F,0xD2,0x29,0xB6,0x9F,0xCF,0x3D,0x7C,0x3C,0xF5,0xC8,0x80};
+ static const char* ascii_fingerprint; // = "F1584918A7370E4CF77D731E4B386990";
+ static const uint8_t binary_fingerprint[16]; // = {0xF1,0x58,0x49,0x18,0xA7,0x37,0x0E,0x4C,0xF7,0x7D,0x73,0x1E,0x4B,0x38,0x69,0x90};
Airavata_updateExperiment_args(const Airavata_updateExperiment_args&);
Airavata_updateExperiment_args& operator=(const Airavata_updateExperiment_args&);
@@ -7912,11 +7908,11 @@ class Airavata_updateExperiment_args {
virtual ~Airavata_updateExperiment_args() throw();
std::string airavataExperimentId;
- ::apache::airavata::model::workspace::experiment::Experiment experiment;
+ ::apache::airavata::model::experiment::ExperimentModel experiment;
void __set_airavataExperimentId(const std::string& val);
- void __set_experiment(const ::apache::airavata::model::workspace::experiment::Experiment& val);
+ void __set_experiment(const ::apache::airavata::model::experiment::ExperimentModel& val);
bool operator == (const Airavata_updateExperiment_args & rhs) const
{
@@ -7942,13 +7938,13 @@ class Airavata_updateExperiment_args {
class Airavata_updateExperiment_pargs {
public:
- static const char* ascii_fingerprint; // = "C58FE3632FD229B69FCF3D7C3CF5C880";
- static const uint8_t binary_fingerprint[16]; // = {0xC5,0x8F,0xE3,0x63,0x2F,0xD2,0x29,0xB6,0x9F,0xCF,0x3D,0x7C,0x3C,0xF5,0xC8,0x80};
+ static const char* ascii_fingerprint; // = "F1584918A7370E4CF77D731E4B386990";
+ static const uint8_t binary_fingerprint[16]; // = {0xF1,0x58,0x49,0x18,0xA7,0x37,0x0E,0x4C,0xF7,0x7D,0x73,0x1E,0x4B,0x38,0x69,0x90};
virtual ~Airavata_updateExperiment_pargs() throw();
const std::string* airavataExperimentId;
- const ::apache::airavata::model::workspace::experiment::Experiment* experiment;
+ const ::apache::airavata::model::experiment::ExperimentModel* experiment;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -8046,8 +8042,8 @@ class Airavata_updateExperiment_presult {
class Airavata_updateExperimentConfiguration_args {
public:
- static const char* ascii_fingerprint; // = "84493E49A74912F49FA7509821557949";
- static const uint8_t binary_fingerprint[16]; // = {0x84,0x49,0x3E,0x49,0xA7,0x49,0x12,0xF4,0x9F,0xA7,0x50,0x98,0x21,0x55,0x79,0x49};
+ static const char* ascii_fingerprint; // = "723AFB51C95762BE1744010484E7DA73";
+ static const uint8_t binary_fingerprint[16]; // = {0x72,0x3A,0xFB,0x51,0xC9,0x57,0x62,0xBE,0x17,0x44,0x01,0x04,0x84,0xE7,0xDA,0x73};
Airavata_updateExperimentConfiguration_args(const Airavata_updateExperimentConfiguration_args&);
Airavata_updateExperimentConfiguration_args& operator=(const Airavata_updateExperimentConfiguration_args&);
@@ -8056,11 +8052,11 @@ class Airavata_updateExperimentConfiguration_args {
virtual ~Airavata_updateExper
<TRUNCATED>
[05/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 cf685ed..1b08caa 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
@@ -867,13 +867,6 @@ class Iface:
"""
pass
- def getDataTransferDetails(self, airavataExperimentId):
- """
- Parameters:
- - airavataExperimentId
- """
- pass
-
def cloneExperiment(self, existingExperimentID, newExperimentName):
"""
Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
@@ -4331,8 +4324,6 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- if result.lve is not None:
- raise result.lve
return
def getExperimentStatus(self, airavataExperimentId):
@@ -4530,45 +4521,6 @@ class Client(Iface):
raise result.ase
raise TApplicationException(TApplicationException.MISSING_RESULT, "getJobDetails failed: unknown result");
- def getDataTransferDetails(self, airavataExperimentId):
- """
- Parameters:
- - airavataExperimentId
- """
- self.send_getDataTransferDetails(airavataExperimentId)
- return self.recv_getDataTransferDetails()
-
- def send_getDataTransferDetails(self, airavataExperimentId):
- self._oprot.writeMessageBegin('getDataTransferDetails', TMessageType.CALL, self._seqid)
- args = getDataTransferDetails_args()
- args.airavataExperimentId = airavataExperimentId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getDataTransferDetails(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getDataTransferDetails_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
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getDataTransferDetails failed: unknown result");
-
def cloneExperiment(self, existingExperimentID, newExperimentName):
"""
Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
@@ -8319,7 +8271,6 @@ class Processor(Iface, TProcessor):
self._processMap["getIntermediateOutputs"] = Processor.process_getIntermediateOutputs
self._processMap["getJobStatuses"] = Processor.process_getJobStatuses
self._processMap["getJobDetails"] = Processor.process_getJobDetails
- self._processMap["getDataTransferDetails"] = Processor.process_getDataTransferDetails
self._processMap["cloneExperiment"] = Processor.process_cloneExperiment
self._processMap["terminateExperiment"] = Processor.process_terminateExperiment
self._processMap["registerApplicationModule"] = Processor.process_registerApplicationModule
@@ -9190,8 +9141,6 @@ class Processor(Iface, TProcessor):
result.ace = ace
except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
result.ase = ase
- except apache.airavata.api.error.ttypes.LaunchValidationException, lve:
- result.lve = lve
oprot.writeMessageBegin("launchExperiment", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
@@ -9297,26 +9246,6 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getDataTransferDetails(self, seqid, iprot, oprot):
- args = getDataTransferDetails_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getDataTransferDetails_result()
- try:
- result.success = self._handler.getDataTransferDetails(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
- oprot.writeMessageBegin("getDataTransferDetails", TMessageType.REPLY, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
def process_cloneExperiment(self, seqid, iprot, oprot):
args = cloneExperiment_args()
args.read(iprot)
@@ -14704,7 +14633,7 @@ class searchExperimentsByName_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -14730,7 +14659,7 @@ class searchExperimentsByName_result:
self.success = []
(_etype61, _size58) = iprot.readListBegin()
for _i62 in xrange(_size58):
- _elem63 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem63 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem63.read(iprot)
self.success.append(_elem63)
iprot.readListEnd()
@@ -14946,7 +14875,7 @@ class searchExperimentsByNameWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -14972,7 +14901,7 @@ class searchExperimentsByNameWithPagination_result:
self.success = []
(_etype68, _size65) = iprot.readListBegin()
for _i69 in xrange(_size65):
- _elem70 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem70 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem70.read(iprot)
self.success.append(_elem70)
iprot.readListEnd()
@@ -15158,7 +15087,7 @@ class searchExperimentsByDesc_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -15184,7 +15113,7 @@ class searchExperimentsByDesc_result:
self.success = []
(_etype75, _size72) = iprot.readListBegin()
for _i76 in xrange(_size72):
- _elem77 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem77 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem77.read(iprot)
self.success.append(_elem77)
iprot.readListEnd()
@@ -15400,7 +15329,7 @@ class searchExperimentsByDescWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -15426,7 +15355,7 @@ class searchExperimentsByDescWithPagination_result:
self.success = []
(_etype82, _size79) = iprot.readListBegin()
for _i83 in xrange(_size79):
- _elem84 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem84 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem84.read(iprot)
self.success.append(_elem84)
iprot.readListEnd()
@@ -15612,7 +15541,7 @@ class searchExperimentsByApplication_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -15638,7 +15567,7 @@ class searchExperimentsByApplication_result:
self.success = []
(_etype89, _size86) = iprot.readListBegin()
for _i90 in xrange(_size86):
- _elem91 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem91 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem91.read(iprot)
self.success.append(_elem91)
iprot.readListEnd()
@@ -15854,7 +15783,7 @@ class searchExperimentsByApplicationWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -15880,7 +15809,7 @@ class searchExperimentsByApplicationWithPagination_result:
self.success = []
(_etype96, _size93) = iprot.readListBegin()
for _i97 in xrange(_size93):
- _elem98 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem98 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem98.read(iprot)
self.success.append(_elem98)
iprot.readListEnd()
@@ -16066,7 +15995,7 @@ class searchExperimentsByStatus_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -16092,7 +16021,7 @@ class searchExperimentsByStatus_result:
self.success = []
(_etype103, _size100) = iprot.readListBegin()
for _i104 in xrange(_size100):
- _elem105 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem105 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem105.read(iprot)
self.success.append(_elem105)
iprot.readListEnd()
@@ -16308,7 +16237,7 @@ class searchExperimentsByStatusWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -16334,7 +16263,7 @@ class searchExperimentsByStatusWithPagination_result:
self.success = []
(_etype110, _size107) = iprot.readListBegin()
for _i111 in xrange(_size107):
- _elem112 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem112 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem112.read(iprot)
self.success.append(_elem112)
iprot.readListEnd()
@@ -16535,7 +16464,7 @@ class searchExperimentsByCreationTime_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -16561,7 +16490,7 @@ class searchExperimentsByCreationTime_result:
self.success = []
(_etype117, _size114) = iprot.readListBegin()
for _i118 in xrange(_size114):
- _elem119 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem119 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem119.read(iprot)
self.success.append(_elem119)
iprot.readListEnd()
@@ -16792,7 +16721,7 @@ class searchExperimentsByCreationTimeWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -16818,7 +16747,7 @@ class searchExperimentsByCreationTimeWithPagination_result:
self.success = []
(_etype124, _size121) = iprot.readListBegin()
for _i125 in xrange(_size121):
- _elem126 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem126 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem126.read(iprot)
self.success.append(_elem126)
iprot.readListEnd()
@@ -17042,7 +16971,7 @@ class searchExperiments_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary, apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -17068,7 +16997,7 @@ class searchExperiments_result:
self.success = []
(_etype140, _size137) = iprot.readListBegin()
for _i141 in xrange(_size137):
- _elem142 = apache.airavata.model.workspace.experiment.ttypes.ExperimentSummary()
+ _elem142 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
_elem142.read(iprot)
self.success.append(_elem142)
iprot.readListEnd()
@@ -17254,7 +17183,7 @@ class getExperimentStatistics_result:
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.experiment.ttypes.ExperimentStatistics, apache.airavata.model.workspace.experiment.ttypes.ExperimentStatistics.thrift_spec), None, ), # 0
+ (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentStatistics, apache.airavata.model.experiment.ttypes.ExperimentStatistics.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -17277,7 +17206,7 @@ class getExperimentStatistics_result:
break
if fid == 0:
if ftype == TType.STRUCT:
- self.success = apache.airavata.model.workspace.experiment.ttypes.ExperimentStatistics()
+ self.success = apache.airavata.model.experiment.ttypes.ExperimentStatistics()
self.success.read(iprot)
else:
iprot.skip(ftype)
@@ -17429,7 +17358,7 @@ class getAllExperimentsInProject_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(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, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -17457,7 +17386,7 @@ class getAllExperimentsInProject_result:
self.success = []
(_etype147, _size144) = iprot.readListBegin()
for _i148 in xrange(_size144):
- _elem149 = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ _elem149 = apache.airavata.model.experiment.ttypes.ExperimentModel()
_elem149.read(iprot)
self.success.append(_elem149)
iprot.readListEnd()
@@ -17655,7 +17584,7 @@ class getAllExperimentsInProjectWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(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, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -17683,7 +17612,7 @@ class getAllExperimentsInProjectWithPagination_result:
self.success = []
(_etype154, _size151) = iprot.readListBegin()
for _i155 in xrange(_size151):
- _elem156 = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ _elem156 = apache.airavata.model.experiment.ttypes.ExperimentModel()
_elem156.read(iprot)
self.success.append(_elem156)
iprot.readListEnd()
@@ -17865,7 +17794,7 @@ class getAllUserExperiments_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(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, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -17891,7 +17820,7 @@ class getAllUserExperiments_result:
self.success = []
(_etype161, _size158) = iprot.readListBegin()
for _i162 in xrange(_size158):
- _elem163 = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ _elem163 = apache.airavata.model.experiment.ttypes.ExperimentModel()
_elem163.read(iprot)
self.success.append(_elem163)
iprot.readListEnd()
@@ -18092,7 +18021,7 @@ class getAllUserExperimentsWithPagination_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(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, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -18118,7 +18047,7 @@ class getAllUserExperimentsWithPagination_result:
self.success = []
(_etype168, _size165) = iprot.readListBegin()
for _i169 in xrange(_size165):
- _elem170 = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ _elem170 = apache.airavata.model.experiment.ttypes.ExperimentModel()
_elem170.read(iprot)
self.success.append(_elem170)
iprot.readListEnd()
@@ -18207,7 +18136,7 @@ class createExperiment_args:
thrift_spec = (
None, # 0
(1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.STRUCT, 'experiment', (apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec), None, ), # 2
+ (2, TType.STRUCT, 'experiment', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ), # 2
)
def __init__(self, gatewayId=None, experiment=None,):
@@ -18230,7 +18159,7 @@ class createExperiment_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRUCT:
- self.experiment = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
self.experiment.read(iprot)
else:
iprot.skip(ftype)
@@ -18464,7 +18393,7 @@ class getExperiment_result:
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec), None, ), # 0
+ (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
@@ -18489,7 +18418,7 @@ class getExperiment_result:
break
if fid == 0:
if ftype == TType.STRUCT:
- self.success = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ self.success = apache.airavata.model.experiment.ttypes.ExperimentModel()
self.success.read(iprot)
else:
iprot.skip(ftype)
@@ -18584,7 +18513,7 @@ class updateExperiment_args:
thrift_spec = (
None, # 0
(1, TType.STRING, 'airavataExperimentId', None, None, ), # 1
- (2, TType.STRUCT, 'experiment', (apache.airavata.model.workspace.experiment.ttypes.Experiment, apache.airavata.model.workspace.experiment.ttypes.Experiment.thrift_spec), None, ), # 2
+ (2, TType.STRUCT, 'experiment', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ), # 2
)
def __init__(self, airavataExperimentId=None, experiment=None,):
@@ -18607,7 +18536,7 @@ class updateExperiment_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRUCT:
- self.experiment = apache.airavata.model.workspace.experiment.ttypes.Experiment()
+ self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
self.experiment.read(iprot)
else:
iprot.skip(ftype)
@@ -18775,7 +18704,7 @@ class updateExperimentConfiguration_args:
thrift_spec = (
None, # 0
(1, TType.STRING, 'airavataExperimentId', None, None, ), # 1
- (2, TType.STRUCT, 'userConfiguration', (apache.airavata.model.workspace.experiment.ttypes.UserConfigurationData, apache.airavata.model.workspace.experiment.ttypes.UserConfigurationData.thrift_spec), None, ), # 2
+ (2, TType.STRUCT, 'userConfiguration', (apache.airavata.model.experiment.ttypes.UserConfigurationDataModel, apache.airavata.model.experiment.ttypes.UserConfigurationDataModel.thrift_spec), None, ), # 2
)
def __init__(self, airavataExperimentId=None, userConfiguration=None,):
@@ -18798,7 +18727,7 @@ class updateExperimentConfiguration_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRUCT:
- self.userConfiguration = apache.airavata.model.workspace.experiment.ttypes.UserConfigurationData()
+ self.userConfiguration = apache.airavata.model.experiment.ttypes.UserConfigurationDataModel()
self.userConfiguration.read(iprot)
else:
iprot.skip(ftype)
@@ -18904,7 +18833,7 @@ class updateResourceScheduleing_args:
thrift_spec = (
None, # 0
(1, TType.STRING, 'airavataExperimentId', None, None, ), # 1
- (2, TType.STRUCT, 'resourceScheduling', (apache.airavata.model.workspace.experiment.ttypes.ComputationalResourceScheduling, apache.airavata.model.workspace.experiment.ttypes.ComputationalResourceScheduling.thrift_spec), None, ), # 2
+ (2, TType.STRUCT, 'resourceScheduling', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ), # 2
)
def __init__(self, airavataExperimentId=None, resourceScheduling=None,):
@@ -18927,7 +18856,7 @@ class updateResourceScheduleing_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRUCT:
- self.resourceScheduling = apache.airavata.model.workspace.experiment.ttypes.ComputationalResourceScheduling()
+ self.resourceScheduling = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
self.resourceScheduling.read(iprot)
else:
iprot.skip(ftype)
@@ -19299,7 +19228,6 @@ class launchExperiment_result:
- enf
- ace
- ase
- - lve
"""
thrift_spec = (
@@ -19308,15 +19236,13 @@ class launchExperiment_result:
(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, 'lve', (apache.airavata.api.error.ttypes.LaunchValidationException, apache.airavata.api.error.ttypes.LaunchValidationException.thrift_spec), None, ), # 5
)
- def __init__(self, ire=None, enf=None, ace=None, ase=None, lve=None,):
+ def __init__(self, ire=None, enf=None, ace=None, ase=None,):
self.ire = ire
self.enf = enf
self.ace = ace
self.ase = ase
- self.lve = lve
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:
@@ -19351,12 +19277,6 @@ class launchExperiment_result:
self.ase.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.STRUCT:
- self.lve = apache.airavata.api.error.ttypes.LaunchValidationException()
- self.lve.read(iprot)
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -19383,10 +19303,6 @@ class launchExperiment_result:
oprot.writeFieldBegin('ase', TType.STRUCT, 4)
self.ase.write(oprot)
oprot.writeFieldEnd()
- if self.lve is not None:
- oprot.writeFieldBegin('lve', TType.STRUCT, 5)
- self.lve.write(oprot)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -19400,7 +19316,6 @@ class launchExperiment_result:
value = (value * 31) ^ hash(self.enf)
value = (value * 31) ^ hash(self.ace)
value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.lve)
return value
def __repr__(self):
@@ -19492,7 +19407,7 @@ class getExperimentStatus_result:
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.experiment.ttypes.ExperimentStatus, apache.airavata.model.workspace.experiment.ttypes.ExperimentStatus.thrift_spec), None, ), # 0
+ (0, TType.STRUCT, 'success', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -19517,7 +19432,7 @@ class getExperimentStatus_result:
break
if fid == 0:
if ftype == TType.STRUCT:
- self.success = apache.airavata.model.workspace.experiment.ttypes.ExperimentStatus()
+ self.success = apache.airavata.model.status.ttypes.ExperimentStatus()
self.success.read(iprot)
else:
iprot.skip(ftype)
@@ -19680,7 +19595,7 @@ class getExperimentOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -19708,7 +19623,7 @@ class getExperimentOutputs_result:
self.success = []
(_etype175, _size172) = iprot.readListBegin()
for _i176 in xrange(_size172):
- _elem177 = apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType()
+ _elem177 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
_elem177.read(iprot)
self.success.append(_elem177)
iprot.readListEnd()
@@ -19876,7 +19791,7 @@ class getIntermediateOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -19904,7 +19819,7 @@ class getIntermediateOutputs_result:
self.success = []
(_etype182, _size179) = iprot.readListBegin()
for _i183 in xrange(_size179):
- _elem184 = apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType()
+ _elem184 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
_elem184.read(iprot)
self.success.append(_elem184)
iprot.readListEnd()
@@ -20072,7 +19987,7 @@ class getJobStatuses_result:
"""
thrift_spec = (
- (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.JobStatus, apache.airavata.model.workspace.experiment.ttypes.JobStatus.thrift_spec)), None, ), # 0
+ (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -20101,7 +20016,7 @@ class getJobStatuses_result:
(_ktype187, _vtype188, _size186 ) = iprot.readMapBegin()
for _i190 in xrange(_size186):
_key191 = iprot.readString();
- _val192 = apache.airavata.model.workspace.experiment.ttypes.JobStatus()
+ _val192 = apache.airavata.model.status.ttypes.JobStatus()
_val192.read(iprot)
self.success[_key191] = _val192
iprot.readMapEnd()
@@ -20270,7 +20185,7 @@ class getJobDetails_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.JobDetails, apache.airavata.model.workspace.experiment.ttypes.JobDetails.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 3
@@ -20298,7 +20213,7 @@ class getJobDetails_result:
self.success = []
(_etype198, _size195) = iprot.readListBegin()
for _i199 in xrange(_size195):
- _elem200 = apache.airavata.model.workspace.experiment.ttypes.JobDetails()
+ _elem200 = apache.airavata.model.job.ttypes.JobModel()
_elem200.read(iprot)
self.success.append(_elem200)
iprot.readListEnd()
@@ -20388,202 +20303,6 @@ class getJobDetails_result:
def __ne__(self, other):
return not (self == other)
-class getDataTransferDetails_args:
- """
- Attributes:
- - airavataExperimentId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRING, 'airavataExperimentId', None, None, ), # 1
- )
-
- def __init__(self, airavataExperimentId=None,):
- 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.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('getDataTransferDetails_args')
- if self.airavataExperimentId is not None:
- oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 1)
- oprot.writeString(self.airavataExperimentId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- 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.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 getDataTransferDetails_result:
- """
- Attributes:
- - success
- - ire
- - enf
- - ace
- - ase
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.workspace.experiment.ttypes.DataTransferDetails, apache.airavata.model.workspace.experiment.ttypes.DataTransferDetails.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
- )
-
- def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None,):
- self.success = success
- self.ire = ire
- self.enf = enf
- self.ace = ace
- self.ase = ase
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype205, _size202) = iprot.readListBegin()
- for _i206 in xrange(_size202):
- _elem207 = apache.airavata.model.workspace.experiment.ttypes.DataTransferDetails()
- _elem207.read(iprot)
- self.success.append(_elem207)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.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)
- 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('getDataTransferDetails_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter208 in self.success:
- iter208.write(oprot)
- oprot.writeListEnd()
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.enf is not None:
- oprot.writeFieldBegin('enf', TType.STRUCT, 2)
- self.enf.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 3)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 4)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- oprot.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)
- 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 cloneExperiment_args:
"""
Attributes:
@@ -21621,11 +21340,11 @@ class getAllAppModules_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype212, _size209) = iprot.readListBegin()
- for _i213 in xrange(_size209):
- _elem214 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem214.read(iprot)
- self.success.append(_elem214)
+ (_etype205, _size202) = iprot.readListBegin()
+ for _i206 in xrange(_size202):
+ _elem207 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem207.read(iprot)
+ self.success.append(_elem207)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21660,8 +21379,8 @@ class getAllAppModules_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter215 in self.success:
- iter215.write(oprot)
+ for iter208 in self.success:
+ iter208.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22701,11 +22420,11 @@ class getAllApplicationDeployments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype219, _size216) = iprot.readListBegin()
- for _i220 in xrange(_size216):
- _elem221 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem221.read(iprot)
- self.success.append(_elem221)
+ (_etype212, _size209) = iprot.readListBegin()
+ for _i213 in xrange(_size209):
+ _elem214 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem214.read(iprot)
+ self.success.append(_elem214)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22740,8 +22459,8 @@ class getAllApplicationDeployments_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter222 in self.success:
- iter222.write(oprot)
+ for iter215 in self.success:
+ iter215.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -22883,10 +22602,10 @@ class getAppModuleDeployedResources_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype226, _size223) = iprot.readListBegin()
- for _i227 in xrange(_size223):
- _elem228 = iprot.readString();
- self.success.append(_elem228)
+ (_etype219, _size216) = iprot.readListBegin()
+ for _i220 in xrange(_size216):
+ _elem221 = iprot.readString();
+ self.success.append(_elem221)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -22921,8 +22640,8 @@ class getAppModuleDeployedResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter229 in self.success:
- oprot.writeString(iter229)
+ for iter222 in self.success:
+ oprot.writeString(iter222)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -23789,11 +23508,11 @@ class getAllApplicationInterfaceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype231, _vtype232, _size230 ) = iprot.readMapBegin()
- for _i234 in xrange(_size230):
- _key235 = iprot.readString();
- _val236 = iprot.readString();
- self.success[_key235] = _val236
+ (_ktype224, _vtype225, _size223 ) = iprot.readMapBegin()
+ for _i227 in xrange(_size223):
+ _key228 = iprot.readString();
+ _val229 = iprot.readString();
+ self.success[_key228] = _val229
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -23828,9 +23547,9 @@ class getAllApplicationInterfaceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter237,viter238 in self.success.items():
- oprot.writeString(kiter237)
- oprot.writeString(viter238)
+ for kiter230,viter231 in self.success.items():
+ oprot.writeString(kiter230)
+ oprot.writeString(viter231)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -23972,11 +23691,11 @@ class getAllApplicationInterfaces_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype242, _size239) = iprot.readListBegin()
- for _i243 in xrange(_size239):
- _elem244 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
- _elem244.read(iprot)
- self.success.append(_elem244)
+ (_etype235, _size232) = iprot.readListBegin()
+ for _i236 in xrange(_size232):
+ _elem237 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+ _elem237.read(iprot)
+ self.success.append(_elem237)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24011,8 +23730,8 @@ class getAllApplicationInterfaces_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter245 in self.success:
- iter245.write(oprot)
+ for iter238 in self.success:
+ iter238.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24130,7 +23849,7 @@ class getApplicationInputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -24154,11 +23873,11 @@ class getApplicationInputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype249, _size246) = iprot.readListBegin()
- for _i250 in xrange(_size246):
- _elem251 = apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType()
- _elem251.read(iprot)
- self.success.append(_elem251)
+ (_etype242, _size239) = iprot.readListBegin()
+ for _i243 in xrange(_size239):
+ _elem244 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem244.read(iprot)
+ self.success.append(_elem244)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24193,8 +23912,8 @@ class getApplicationInputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter252 in self.success:
- iter252.write(oprot)
+ for iter245 in self.success:
+ iter245.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24312,7 +24031,7 @@ class getApplicationOutputs_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -24336,11 +24055,11 @@ class getApplicationOutputs_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype256, _size253) = iprot.readListBegin()
- for _i257 in xrange(_size253):
- _elem258 = apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType()
- _elem258.read(iprot)
- self.success.append(_elem258)
+ (_etype249, _size246) = iprot.readListBegin()
+ for _i250 in xrange(_size246):
+ _elem251 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem251.read(iprot)
+ self.success.append(_elem251)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -24375,8 +24094,8 @@ class getApplicationOutputs_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter259 in self.success:
- iter259.write(oprot)
+ for iter252 in self.success:
+ iter252.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -24518,11 +24237,11 @@ class getAvailableAppInterfaceComputeResources_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype261, _vtype262, _size260 ) = iprot.readMapBegin()
- for _i264 in xrange(_size260):
- _key265 = iprot.readString();
- _val266 = iprot.readString();
- self.success[_key265] = _val266
+ (_ktype254, _vtype255, _size253 ) = iprot.readMapBegin()
+ for _i257 in xrange(_size253):
+ _key258 = iprot.readString();
+ _val259 = iprot.readString();
+ self.success[_key258] = _val259
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -24557,9 +24276,9 @@ class getAvailableAppInterfaceComputeResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter267,viter268 in self.success.items():
- oprot.writeString(kiter267)
- oprot.writeString(viter268)
+ for kiter260,viter261 in self.success.items():
+ oprot.writeString(kiter260)
+ oprot.writeString(viter261)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -25028,11 +24747,11 @@ class getAllComputeResourceNames_result:
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype270, _vtype271, _size269 ) = iprot.readMapBegin()
- for _i273 in xrange(_size269):
- _key274 = iprot.readString();
- _val275 = iprot.readString();
- self.success[_key274] = _val275
+ (_ktype263, _vtype264, _size262 ) = iprot.readMapBegin()
+ for _i266 in xrange(_size262):
+ _key267 = iprot.readString();
+ _val268 = iprot.readString();
+ self.success[_key267] = _val268
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -25067,9 +24786,9 @@ class getAllComputeResourceNames_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter276,viter277 in self.success.items():
- oprot.writeString(kiter276)
- oprot.writeString(viter277)
+ for kiter269,viter270 in self.success.items():
+ oprot.writeString(kiter269)
+ oprot.writeString(viter270)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -30410,11 +30129,11 @@ class changeJobSubmissionPriorities_args:
if fid == 1:
if ftype == TType.MAP:
self.jobSubmissionPriorityMap = {}
- (_ktype279, _vtype280, _size278 ) = iprot.readMapBegin()
- for _i282 in xrange(_size278):
- _key283 = iprot.readString();
- _val284 = iprot.readI32();
- self.jobSubmissionPriorityMap[_key283] = _val284
+ (_ktype272, _vtype273, _size271 ) = iprot.readMapBegin()
+ for _i275 in xrange(_size271):
+ _key276 = iprot.readString();
+ _val277 = iprot.readI32();
+ self.jobSubmissionPriorityMap[_key276] = _val277
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -30431,9 +30150,9 @@ class changeJobSubmissionPriorities_args:
if self.jobSubmissionPriorityMap is not None:
oprot.writeFieldBegin('jobSubmissionPriorityMap', TType.MAP, 1)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.jobSubmissionPriorityMap))
- for kiter285,viter286 in self.jobSubmissionPriorityMap.items():
- oprot.writeString(kiter285)
- oprot.writeI32(viter286)
+ for kiter278,viter279 in self.jobSubmissionPriorityMap.items():
+ oprot.writeString(kiter278)
+ oprot.writeI32(viter279)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -30593,11 +30312,11 @@ class changeDataMovementPriorities_args:
if fid == 1:
if ftype == TType.MAP:
self.dataMovementPriorityMap = {}
- (_ktype288, _vtype289, _size287 ) = iprot.readMapBegin()
- for _i291 in xrange(_size287):
- _key292 = iprot.readString();
- _val293 = iprot.readI32();
- self.dataMovementPriorityMap[_key292] = _val293
+ (_ktype281, _vtype282, _size280 ) = iprot.readMapBegin()
+ for _i284 in xrange(_size280):
+ _key285 = iprot.readString();
+ _val286 = iprot.readI32();
+ self.dataMovementPriorityMap[_key285] = _val286
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -30614,9 +30333,9 @@ class changeDataMovementPriorities_args:
if self.dataMovementPriorityMap is not None:
oprot.writeFieldBegin('dataMovementPriorityMap', TType.MAP, 1)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.dataMovementPriorityMap))
- for kiter294,viter295 in self.dataMovementPriorityMap.items():
- oprot.writeString(kiter294)
- oprot.writeI32(viter295)
+ for kiter287,viter288 in self.dataMovementPriorityMap.items():
+ oprot.writeString(kiter287)
+ oprot.writeI32(viter288)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -33228,11 +32947,11 @@ class getAllGatewayComputeResourcePreferences_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype299, _size296) = iprot.readListBegin()
- for _i300 in xrange(_size296):
- _elem301 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
- _elem301.read(iprot)
- self.success.append(_elem301)
+ (_etype292, _size289) = iprot.readListBegin()
+ for _i293 in xrange(_size289):
+ _elem294 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+ _elem294.read(iprot)
+ self.success.append(_elem294)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -33267,8 +32986,8 @@ class getAllGatewayComputeResourcePreferences_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter302 in self.success:
- iter302.write(oprot)
+ for iter295 in self.success:
+ iter295.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -33389,11 +33108,11 @@ class getAllGatewayComputeResources_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype306, _size303) = iprot.readListBegin()
- for _i307 in xrange(_size303):
- _elem308 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
- _elem308.read(iprot)
- self.success.append(_elem308)
+ (_etype299, _size296) = iprot.readListBegin()
+ for _i300 in xrange(_size296):
+ _elem301 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+ _elem301.read(iprot)
+ self.success.append(_elem301)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -33428,8 +33147,8 @@ class getAllGatewayComputeResources_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter309 in self.success:
- iter309.write(oprot)
+ for iter302 in self.success:
+ iter302.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -33963,10 +33682,10 @@ class getAllWorkflows_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype313, _size310) = iprot.readListBegin()
- for _i314 in xrange(_size310):
- _elem315 = iprot.readString();
- self.success.append(_elem315)
+ (_etype306, _size303) = iprot.readListBegin()
+ for _i307 in xrange(_size303):
+ _elem308 = iprot.readString();
+ self.success.append(_elem308)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -34001,8 +33720,8 @@ class getAllWorkflows_result:
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter316 in self.success:
- oprot.writeString(iter316)
+ for iter309 in self.success:
+ oprot.writeString(iter309)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py
index 199d1d2..0c33acf 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/error/ttypes.py
@@ -7,7 +7,7 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-import apache.airavata.model.workspace.experiment.ttypes
+import apache.airavata.model.experiment.ttypes
from thrift.transport import TTransport
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
index d125652..ac1c6ab 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/ttypes.py
@@ -9,9 +9,13 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.api.error.ttypes
import apache.airavata.model.ttypes
-import apache.airavata.model.workspace.experiment.ttypes
+import apache.airavata.model.status.ttypes
+import apache.airavata.model.job.ttypes
+import apache.airavata.model.experiment.ttypes
import apache.airavata.model.workspace.ttypes
import apache.airavata.model.appcatalog.computeresource.ttypes
+import apache.airavata.model.scheduling.ttypes
+import apache.airavata.model.application.io.ttypes
import apache.airavata.model.appcatalog.appdeployment.ttypes
import apache.airavata.model.appcatalog.appinterface.ttypes
import apache.airavata.model.appcatalog.gatewayprofile.ttypes
[13/14] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Conflicts:
airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py
airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
thrift-interface-descriptions/airavata-api/experiment_model.thrift
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/144c1d8e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/144c1d8e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/144c1d8e
Branch: refs/heads/master
Commit: 144c1d8ecf467d7b8b8f4360e49a47f701911fb1
Parents: ec1ba5a e5d861e
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jun 24 03:05:36 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jun 24 03:05:36 2015 +0530
----------------------------------------------------------------------
.../model/messaging/event/JobIdentifier.java | 110 ++--
.../model/messaging/event/MessageType.java | 4 +-
.../messaging/event/ProcessIdentifier.java | 608 +++++++++++++++++++
.../event/ProcessStatusChangeEvent.java | 524 ++++++++++++++++
.../event/ProcessStatusChangeRequestEvent.java | 524 ++++++++++++++++
.../model/messaging/event/TaskIdentifier.java | 110 ++--
.../airavata/model/process/ProcessModel.java | 218 +++++--
.../apache/airavata/gfac/core/GFacUtils.java | 67 +-
.../gfac/impl/AiravataJobStatusUpdator.java | 240 ++++----
.../gfac/impl/AiravataProcessStatusUpdator.java | 254 ++++----
.../gfac/impl/AiravataTaskStatusUpdator.java | 318 +++++-----
.../messaging/client/RabbitMQListener.java | 2 +-
.../core/impl/RabbitMQStatusConsumer.java | 2 +-
.../core/impl/RabbitMQStatusPublisher.java | 14 +-
.../utils/ThriftDataModelConversion.java | 6 +-
.../airavata-api/messaging_events.thrift | 22 +-
.../airavata-api/process_model.thrift | 19 +-
17 files changed, 2435 insertions(+), 607 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/144c1d8e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
[04/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
index 6cca1a2..6d54006 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appinterface/ttypes.py
@@ -7,6 +7,8 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+import apache.airavata.model.application.io.ttypes
+
from thrift.transport import TTransport
from thrift.protocol import TBinaryProtocol, TProtocol
@@ -16,454 +18,6 @@ except:
fastbinary = None
-class DataType:
- """
- Data Types supported in Airavata. The primitive data types
-
- """
- STRING = 0
- INTEGER = 1
- FLOAT = 2
- URI = 3
- STDOUT = 4
- STDERR = 5
-
- _VALUES_TO_NAMES = {
- 0: "STRING",
- 1: "INTEGER",
- 2: "FLOAT",
- 3: "URI",
- 4: "STDOUT",
- 5: "STDERR",
- }
-
- _NAMES_TO_VALUES = {
- "STRING": 0,
- "INTEGER": 1,
- "FLOAT": 2,
- "URI": 3,
- "STDOUT": 4,
- "STDERR": 5,
- }
-
-
-class InputDataObjectType:
- """
- Application Inputs. The paramters describe how inputs are passed to the application.
-
- name:
- Name of the parameter.
-
- value:
- Value of the parameter. A default value could be set during registration.
-
- type:
- Data type of the parameter
-
- applicationArguement:
- The argument flag sent to the application. Such as -p pressure.
-
- standardInput:
- When this value is set, the parameter is sent as standard input rather than a parameter.
- Typically this is passed using redirection operator ">".
-
- userFriendlyDescription:
- Description to be displayed at the user interface.
-
- metaData:
- Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
-
-
- Attributes:
- - name
- - value
- - type
- - applicationArgument
- - standardInput
- - userFriendlyDescription
- - metaData
- - inputOrder
- - isRequired
- - requiredToAddedToCommandLine
- - dataStaged
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRING, 'name', None, None, ), # 1
- (2, TType.STRING, 'value', None, None, ), # 2
- (3, TType.I32, 'type', None, None, ), # 3
- (4, TType.STRING, 'applicationArgument', None, None, ), # 4
- (5, TType.BOOL, 'standardInput', None, False, ), # 5
- (6, TType.STRING, 'userFriendlyDescription', None, None, ), # 6
- (7, TType.STRING, 'metaData', None, None, ), # 7
- (8, TType.I32, 'inputOrder', None, None, ), # 8
- (9, TType.BOOL, 'isRequired', None, None, ), # 9
- (10, TType.BOOL, 'requiredToAddedToCommandLine', None, None, ), # 10
- (11, TType.BOOL, 'dataStaged', None, False, ), # 11
- )
-
- def __init__(self, name=None, value=None, type=None, applicationArgument=None, standardInput=thrift_spec[5][4], userFriendlyDescription=None, metaData=None, inputOrder=None, isRequired=None, requiredToAddedToCommandLine=None, dataStaged=thrift_spec[11][4],):
- self.name = name
- self.value = value
- self.type = type
- self.applicationArgument = applicationArgument
- self.standardInput = standardInput
- self.userFriendlyDescription = userFriendlyDescription
- self.metaData = metaData
- self.inputOrder = inputOrder
- self.isRequired = isRequired
- self.requiredToAddedToCommandLine = requiredToAddedToCommandLine
- self.dataStaged = dataStaged
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRING:
- self.name = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.value = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.I32:
- self.type = iprot.readI32();
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.applicationArgument = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.BOOL:
- self.standardInput = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.STRING:
- self.userFriendlyDescription = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 7:
- if ftype == TType.STRING:
- self.metaData = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 8:
- if ftype == TType.I32:
- self.inputOrder = iprot.readI32();
- else:
- iprot.skip(ftype)
- elif fid == 9:
- if ftype == TType.BOOL:
- self.isRequired = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 10:
- if ftype == TType.BOOL:
- self.requiredToAddedToCommandLine = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 11:
- if ftype == TType.BOOL:
- self.dataStaged = iprot.readBool();
- 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('InputDataObjectType')
- if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 1)
- oprot.writeString(self.name)
- oprot.writeFieldEnd()
- if self.value is not None:
- oprot.writeFieldBegin('value', TType.STRING, 2)
- oprot.writeString(self.value)
- oprot.writeFieldEnd()
- if self.type is not None:
- oprot.writeFieldBegin('type', TType.I32, 3)
- oprot.writeI32(self.type)
- oprot.writeFieldEnd()
- if self.applicationArgument is not None:
- oprot.writeFieldBegin('applicationArgument', TType.STRING, 4)
- oprot.writeString(self.applicationArgument)
- oprot.writeFieldEnd()
- if self.standardInput is not None:
- oprot.writeFieldBegin('standardInput', TType.BOOL, 5)
- oprot.writeBool(self.standardInput)
- oprot.writeFieldEnd()
- if self.userFriendlyDescription is not None:
- oprot.writeFieldBegin('userFriendlyDescription', TType.STRING, 6)
- oprot.writeString(self.userFriendlyDescription)
- oprot.writeFieldEnd()
- if self.metaData is not None:
- oprot.writeFieldBegin('metaData', TType.STRING, 7)
- oprot.writeString(self.metaData)
- oprot.writeFieldEnd()
- if self.inputOrder is not None:
- oprot.writeFieldBegin('inputOrder', TType.I32, 8)
- oprot.writeI32(self.inputOrder)
- oprot.writeFieldEnd()
- if self.isRequired is not None:
- oprot.writeFieldBegin('isRequired', TType.BOOL, 9)
- oprot.writeBool(self.isRequired)
- oprot.writeFieldEnd()
- if self.requiredToAddedToCommandLine is not None:
- oprot.writeFieldBegin('requiredToAddedToCommandLine', TType.BOOL, 10)
- oprot.writeBool(self.requiredToAddedToCommandLine)
- oprot.writeFieldEnd()
- if self.dataStaged is not None:
- oprot.writeFieldBegin('dataStaged', TType.BOOL, 11)
- oprot.writeBool(self.dataStaged)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.name is None:
- raise TProtocol.TProtocolException(message='Required field name is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.name)
- value = (value * 31) ^ hash(self.value)
- value = (value * 31) ^ hash(self.type)
- value = (value * 31) ^ hash(self.applicationArgument)
- value = (value * 31) ^ hash(self.standardInput)
- value = (value * 31) ^ hash(self.userFriendlyDescription)
- value = (value * 31) ^ hash(self.metaData)
- value = (value * 31) ^ hash(self.inputOrder)
- value = (value * 31) ^ hash(self.isRequired)
- value = (value * 31) ^ hash(self.requiredToAddedToCommandLine)
- value = (value * 31) ^ hash(self.dataStaged)
- 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 OutputDataObjectType:
- """
- Application Outputs. The paramters describe how outputs generated by the application.
-
- name:
- Name of the parameter.
-
- value:
- Value of the parameter.
-
- type:
- Data type of the parameter
-
- applicationArguement:
- The argument flag sent to the application. Such as -p pressure.
-
- standardInput:
- When this value is set, the parameter is sent as standard input rather than a parameter.
- Typically this is passed using redirection operator ">".
-
- userFriendlyDescription:
- Description to be displayed at the user interface.
-
- metaData:
- Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
-
-
- Attributes:
- - name
- - value
- - type
- - applicationArgument
- - isRequired
- - requiredToAddedToCommandLine
- - dataMovement
- - location
- - searchQuery
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRING, 'name', None, None, ), # 1
- (2, TType.STRING, 'value', None, None, ), # 2
- (3, TType.I32, 'type', None, None, ), # 3
- (4, TType.STRING, 'applicationArgument', None, None, ), # 4
- (5, TType.BOOL, 'isRequired', None, None, ), # 5
- (6, TType.BOOL, 'requiredToAddedToCommandLine', None, None, ), # 6
- (7, TType.BOOL, 'dataMovement', None, None, ), # 7
- (8, TType.STRING, 'location', None, None, ), # 8
- (9, TType.STRING, 'searchQuery', None, None, ), # 9
- )
-
- def __init__(self, name=None, value=None, type=None, applicationArgument=None, isRequired=None, requiredToAddedToCommandLine=None, dataMovement=None, location=None, searchQuery=None,):
- self.name = name
- self.value = value
- self.type = type
- self.applicationArgument = applicationArgument
- self.isRequired = isRequired
- self.requiredToAddedToCommandLine = requiredToAddedToCommandLine
- self.dataMovement = dataMovement
- self.location = location
- self.searchQuery = searchQuery
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRING:
- self.name = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.value = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.I32:
- self.type = iprot.readI32();
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.applicationArgument = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.BOOL:
- self.isRequired = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.BOOL:
- self.requiredToAddedToCommandLine = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 7:
- if ftype == TType.BOOL:
- self.dataMovement = iprot.readBool();
- else:
- iprot.skip(ftype)
- elif fid == 8:
- if ftype == TType.STRING:
- self.location = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 9:
- if ftype == TType.STRING:
- self.searchQuery = 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('OutputDataObjectType')
- if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 1)
- oprot.writeString(self.name)
- oprot.writeFieldEnd()
- if self.value is not None:
- oprot.writeFieldBegin('value', TType.STRING, 2)
- oprot.writeString(self.value)
- oprot.writeFieldEnd()
- if self.type is not None:
- oprot.writeFieldBegin('type', TType.I32, 3)
- oprot.writeI32(self.type)
- oprot.writeFieldEnd()
- if self.applicationArgument is not None:
- oprot.writeFieldBegin('applicationArgument', TType.STRING, 4)
- oprot.writeString(self.applicationArgument)
- oprot.writeFieldEnd()
- if self.isRequired is not None:
- oprot.writeFieldBegin('isRequired', TType.BOOL, 5)
- oprot.writeBool(self.isRequired)
- oprot.writeFieldEnd()
- if self.requiredToAddedToCommandLine is not None:
- oprot.writeFieldBegin('requiredToAddedToCommandLine', TType.BOOL, 6)
- oprot.writeBool(self.requiredToAddedToCommandLine)
- oprot.writeFieldEnd()
- if self.dataMovement is not None:
- oprot.writeFieldBegin('dataMovement', TType.BOOL, 7)
- oprot.writeBool(self.dataMovement)
- oprot.writeFieldEnd()
- if self.location is not None:
- oprot.writeFieldBegin('location', TType.STRING, 8)
- oprot.writeString(self.location)
- oprot.writeFieldEnd()
- if self.searchQuery is not None:
- oprot.writeFieldBegin('searchQuery', TType.STRING, 9)
- oprot.writeString(self.searchQuery)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.name is None:
- raise TProtocol.TProtocolException(message='Required field name is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.name)
- value = (value * 31) ^ hash(self.value)
- value = (value * 31) ^ hash(self.type)
- value = (value * 31) ^ hash(self.applicationArgument)
- value = (value * 31) ^ hash(self.isRequired)
- value = (value * 31) ^ hash(self.requiredToAddedToCommandLine)
- value = (value * 31) ^ hash(self.dataMovement)
- value = (value * 31) ^ hash(self.location)
- value = (value * 31) ^ hash(self.searchQuery)
- 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 ApplicationInterfaceDescription:
"""
@@ -494,8 +48,8 @@ class ApplicationInterfaceDescription:
(2, TType.STRING, 'applicationName', None, None, ), # 2
(3, TType.STRING, 'applicationDescription', None, None, ), # 3
(4, TType.LIST, 'applicationModules', (TType.STRING,None), None, ), # 4
- (5, TType.LIST, 'applicationInputs', (TType.STRUCT,(InputDataObjectType, InputDataObjectType.thrift_spec)), None, ), # 5
- (6, TType.LIST, 'applicationOutputs', (TType.STRUCT,(OutputDataObjectType, OutputDataObjectType.thrift_spec)), None, ), # 6
+ (5, TType.LIST, 'applicationInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 5
+ (6, TType.LIST, 'applicationOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 6
)
def __init__(self, applicationInterfaceId=thrift_spec[1][4], applicationName=None, applicationDescription=None, applicationModules=None, applicationInputs=None, applicationOutputs=None,):
@@ -545,7 +99,7 @@ class ApplicationInterfaceDescription:
self.applicationInputs = []
(_etype9, _size6) = iprot.readListBegin()
for _i10 in xrange(_size6):
- _elem11 = InputDataObjectType()
+ _elem11 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
_elem11.read(iprot)
self.applicationInputs.append(_elem11)
iprot.readListEnd()
@@ -556,7 +110,7 @@ class ApplicationInterfaceDescription:
self.applicationOutputs = []
(_etype15, _size12) = iprot.readListBegin()
for _i16 in xrange(_size12):
- _elem17 = OutputDataObjectType()
+ _elem17 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
_elem17.read(iprot)
self.applicationOutputs.append(_elem17)
iprot.readListEnd()
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py
index 51df813..2bb74be 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/messaging/event/ttypes.py
@@ -7,8 +7,8 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-import apache.airavata.model.workspace.experiment.ttypes
-import apache.airavata.model.appcatalog.appinterface.ttypes
+import apache.airavata.model.status.ttypes
+import apache.airavata.model.application.io.ttypes
from thrift.transport import TTransport
@@ -166,186 +166,6 @@ class ExperimentStatusChangeEvent:
def __ne__(self, other):
return not (self == other)
-class WorkflowIdentifier:
- """
- Attributes:
- - workflowNodeId
- - experimentId
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRING, 'workflowNodeId', None, None, ), # 1
- (2, TType.STRING, 'experimentId', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', None, None, ), # 3
- )
-
- def __init__(self, workflowNodeId=None, experimentId=None, gatewayId=None,):
- self.workflowNodeId = workflowNodeId
- self.experimentId = experimentId
- self.gatewayId = gatewayId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRING:
- self.workflowNodeId = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.experimentId = iprot.readString();
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString();
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- 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('WorkflowIdentifier')
- if self.workflowNodeId is not None:
- oprot.writeFieldBegin('workflowNodeId', TType.STRING, 1)
- oprot.writeString(self.workflowNodeId)
- oprot.writeFieldEnd()
- if self.experimentId is not None:
- oprot.writeFieldBegin('experimentId', TType.STRING, 2)
- oprot.writeString(self.experimentId)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.workflowNodeId is None:
- raise TProtocol.TProtocolException(message='Required field workflowNodeId is unset!')
- if self.experimentId is None:
- raise TProtocol.TProtocolException(message='Required field experimentId is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.workflowNodeId)
- value = (value * 31) ^ hash(self.experimentId)
- value = (value * 31) ^ hash(self.gatewayId)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class WorkflowNodeStatusChangeEvent:
- """
- Attributes:
- - state
- - workflowNodeIdentity
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.I32, 'state', None, None, ), # 1
- (2, TType.STRUCT, 'workflowNodeIdentity', (WorkflowIdentifier, WorkflowIdentifier.thrift_spec), None, ), # 2
- )
-
- def __init__(self, state=None, workflowNodeIdentity=None,):
- self.state = state
- self.workflowNodeIdentity = workflowNodeIdentity
-
- 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.I32:
- self.state = iprot.readI32();
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.workflowNodeIdentity = WorkflowIdentifier()
- self.workflowNodeIdentity.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('WorkflowNodeStatusChangeEvent')
- if self.state is not None:
- oprot.writeFieldBegin('state', TType.I32, 1)
- oprot.writeI32(self.state)
- oprot.writeFieldEnd()
- if self.workflowNodeIdentity is not None:
- oprot.writeFieldBegin('workflowNodeIdentity', TType.STRUCT, 2)
- self.workflowNodeIdentity.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.state is None:
- raise TProtocol.TProtocolException(message='Required field state is unset!')
- if self.workflowNodeIdentity is None:
- raise TProtocol.TProtocolException(message='Required field workflowNodeIdentity is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.state)
- value = (value * 31) ^ hash(self.workflowNodeIdentity)
- 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 TaskIdentifier:
"""
Attributes:
@@ -633,7 +453,7 @@ class TaskOutputChangeEvent:
thrift_spec = (
None, # 0
- (1, TType.LIST, 'output', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 1
+ (1, TType.LIST, 'output', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 1
(2, TType.STRUCT, 'taskIdentity', (TaskIdentifier, TaskIdentifier.thrift_spec), None, ), # 2
)
@@ -655,7 +475,7 @@ class TaskOutputChangeEvent:
self.output = []
(_etype3, _size0) = iprot.readListBegin()
for _i4 in xrange(_size0):
- _elem5 = apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType()
+ _elem5 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
_elem5.read(iprot)
self.output.append(_elem5)
iprot.readListEnd()
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
index 4dc1f16..73269eb 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/ttypes.py
@@ -11,6 +11,9 @@ import apache.airavata.model.workspace.ttypes
import apache.airavata.api.error.ttypes
import apache.airavata.model.messaging.event.ttypes
import apache.airavata.model.security.ttypes
+import apache.airavata.model.job.ttypes
+import apache.airavata.model.task.ttypes
+import apache.airavata.model.process.ttypes
from thrift.transport import TTransport
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
index 4ffa580..aa8c76c 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workflow/ttypes.py
@@ -7,7 +7,7 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-import apache.airavata.model.appcatalog.appinterface.ttypes
+import apache.airavata.model.application.io.ttypes
from thrift.transport import TTransport
@@ -36,8 +36,8 @@ class Workflow:
(2, TType.STRING, 'name', None, None, ), # 2
(3, TType.STRING, 'graph', None, None, ), # 3
(4, TType.STRING, 'image', None, None, ), # 4
- (5, TType.LIST, 'workflowInputs', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType.thrift_spec)), None, ), # 5
- (6, TType.LIST, 'workflowOutputs', (TType.STRUCT,(apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType, apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 6
+ (5, TType.LIST, 'workflowInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 5
+ (6, TType.LIST, 'workflowOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 6
)
def __init__(self, templateId=thrift_spec[1][4], name=None, graph=None, image=None, workflowInputs=None, workflowOutputs=None,):
@@ -82,7 +82,7 @@ class Workflow:
self.workflowInputs = []
(_etype3, _size0) = iprot.readListBegin()
for _i4 in xrange(_size0):
- _elem5 = apache.airavata.model.appcatalog.appinterface.ttypes.InputDataObjectType()
+ _elem5 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
_elem5.read(iprot)
self.workflowInputs.append(_elem5)
iprot.readListEnd()
@@ -93,7 +93,7 @@ class Workflow:
self.workflowOutputs = []
(_etype9, _size6) = iprot.readListBegin()
for _i10 in xrange(_size6):
- _elem11 = apache.airavata.model.appcatalog.appinterface.ttypes.OutputDataObjectType()
+ _elem11 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
_elem11.read(iprot)
self.workflowOutputs.append(_elem11)
iprot.readListEnd()
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index d185eb0..a480781 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -7,8 +7,6 @@
#
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
-import apache.airavata.model.workspace.experiment.ttypes
-
from thrift.transport import TTransport
from thrift.protocol import TBinaryProtocol, TProtocol
@@ -113,7 +111,7 @@ class Project:
thrift_spec = (
None, # 0
- (1, TType.STRING, 'projectID', None, "DEFAULT", ), # 1
+ (1, TType.STRING, 'projectID', None, None, ), # 1
(2, TType.STRING, 'owner', None, None, ), # 2
(3, TType.STRING, 'name', None, None, ), # 3
(4, TType.STRING, 'description', None, None, ), # 4
@@ -122,7 +120,7 @@ class Project:
(7, TType.LIST, 'sharedGroups', (TType.STRING,None), None, ), # 7
)
- def __init__(self, projectID=thrift_spec[1][4], owner=None, name=None, description=None, creationTime=None, sharedUsers=None, sharedGroups=None,):
+ def __init__(self, projectID=None, owner=None, name=None, description=None, creationTime=None, sharedUsers=None, sharedGroups=None,):
self.projectID = projectID
self.owner = owner
self.name = name
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 45ba60c..3132e6a 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 f8d8fb6..a51062b 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 7b39466..9c2b5f6 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 c807298..ec77984 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* value:
* Value of the environment variable to set
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 714a099..6c65532 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 47128af..82f6f40 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 0c20e69..455a4f6 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 eb91146..f8d1b00 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ab7e225..72d24cd 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 43612fa..0450885 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 59fc13a..6df8d7f 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 b674fb1..9942cef 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 839317f..0b7a752 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 1b46eb9..3877d65 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ec7703f..12e1f20 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 17b8c8f..dc853f4 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4b2cc08..cd4f369 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 a94848c..145eb41 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 829546f..d02faba 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 9e96307..866f0ee 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory;
* account to be used has to be added to the allocation.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 fdbbc21..9087d89 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 96dd7f7..057c826 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 6faaafb..268f12b 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 8e054bd..eb4cb45 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 319c493..b7a0538 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 8ef4b28..e2ba906 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 5147617..8abbcb6 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 ce12be8..9ab06f2 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 09a2bc5..20bd2d8 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 d9832f3..37accaa 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 c739854..6b1a913 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 fd043b3..2ebacd1 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 4b91522..b8ea2df 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 764fa83..2af31b8 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 2843773..c23bbb6 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 7bd9f2e..f2013f1 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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/ed63a40a/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 7b3018f..bec8af3 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
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");
[06/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
index 02e5749..df31203 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -18,643 +18,6 @@ use Thrift\Exception\TApplicationException;
/**
- * Data Types supported in Airavata. The primitive data types
- *
- */
-final class DataType {
- const STRING = 0;
- const INTEGER = 1;
- const FLOAT = 2;
- const URI = 3;
- const STDOUT = 4;
- const STDERR = 5;
- static public $__names = array(
- 0 => 'STRING',
- 1 => 'INTEGER',
- 2 => 'FLOAT',
- 3 => 'URI',
- 4 => 'STDOUT',
- 5 => 'STDERR',
- );
-}
-
-/**
- * Application Inputs. The paramters describe how inputs are passed to the application.
- *
- * name:
- * Name of the parameter.
- *
- * value:
- * Value of the parameter. A default value could be set during registration.
- *
- * type:
- * Data type of the parameter
- *
- * applicationArguement:
- * The argument flag sent to the application. Such as -p pressure.
- *
- * standardInput:
- * When this value is set, the parameter is sent as standard input rather than a parameter.
- * Typically this is passed using redirection operator ">".
- *
- * userFriendlyDescription:
- * Description to be displayed at the user interface.
- *
- * metaData:
- * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
- *
- */
-class InputDataObjectType {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $name = null;
- /**
- * @var string
- */
- public $value = null;
- /**
- * @var int
- */
- public $type = null;
- /**
- * @var string
- */
- public $applicationArgument = null;
- /**
- * @var bool
- */
- public $standardInput = false;
- /**
- * @var string
- */
- public $userFriendlyDescription = null;
- /**
- * @var string
- */
- public $metaData = null;
- /**
- * @var int
- */
- public $inputOrder = null;
- /**
- * @var bool
- */
- public $isRequired = null;
- /**
- * @var bool
- */
- public $requiredToAddedToCommandLine = null;
- /**
- * @var bool
- */
- public $dataStaged = false;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'name',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'value',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'type',
- 'type' => TType::I32,
- ),
- 4 => array(
- 'var' => 'applicationArgument',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'standardInput',
- 'type' => TType::BOOL,
- ),
- 6 => array(
- 'var' => 'userFriendlyDescription',
- 'type' => TType::STRING,
- ),
- 7 => array(
- 'var' => 'metaData',
- 'type' => TType::STRING,
- ),
- 8 => array(
- 'var' => 'inputOrder',
- 'type' => TType::I32,
- ),
- 9 => array(
- 'var' => 'isRequired',
- 'type' => TType::BOOL,
- ),
- 10 => array(
- 'var' => 'requiredToAddedToCommandLine',
- 'type' => TType::BOOL,
- ),
- 11 => array(
- 'var' => 'dataStaged',
- 'type' => TType::BOOL,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['name'])) {
- $this->name = $vals['name'];
- }
- if (isset($vals['value'])) {
- $this->value = $vals['value'];
- }
- if (isset($vals['type'])) {
- $this->type = $vals['type'];
- }
- if (isset($vals['applicationArgument'])) {
- $this->applicationArgument = $vals['applicationArgument'];
- }
- if (isset($vals['standardInput'])) {
- $this->standardInput = $vals['standardInput'];
- }
- if (isset($vals['userFriendlyDescription'])) {
- $this->userFriendlyDescription = $vals['userFriendlyDescription'];
- }
- if (isset($vals['metaData'])) {
- $this->metaData = $vals['metaData'];
- }
- if (isset($vals['inputOrder'])) {
- $this->inputOrder = $vals['inputOrder'];
- }
- if (isset($vals['isRequired'])) {
- $this->isRequired = $vals['isRequired'];
- }
- if (isset($vals['requiredToAddedToCommandLine'])) {
- $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
- }
- if (isset($vals['dataStaged'])) {
- $this->dataStaged = $vals['dataStaged'];
- }
- }
- }
-
- public function getName() {
- return 'InputDataObjectType';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->name);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->value);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->type);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->applicationArgument);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->standardInput);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userFriendlyDescription);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->metaData);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 8:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->inputOrder);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isRequired);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 10:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->requiredToAddedToCommandLine);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->dataStaged);
- } 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('InputDataObjectType');
- if ($this->name !== null) {
- $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
- $xfer += $output->writeString($this->name);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->value !== null) {
- $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
- $xfer += $output->writeString($this->value);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->type !== null) {
- $xfer += $output->writeFieldBegin('type', TType::I32, 3);
- $xfer += $output->writeI32($this->type);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->applicationArgument !== null) {
- $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4);
- $xfer += $output->writeString($this->applicationArgument);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->standardInput !== null) {
- $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 5);
- $xfer += $output->writeBool($this->standardInput);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userFriendlyDescription !== null) {
- $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 6);
- $xfer += $output->writeString($this->userFriendlyDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->metaData !== null) {
- $xfer += $output->writeFieldBegin('metaData', TType::STRING, 7);
- $xfer += $output->writeString($this->metaData);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->inputOrder !== null) {
- $xfer += $output->writeFieldBegin('inputOrder', TType::I32, 8);
- $xfer += $output->writeI32($this->inputOrder);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->isRequired !== null) {
- $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 9);
- $xfer += $output->writeBool($this->isRequired);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->requiredToAddedToCommandLine !== null) {
- $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 10);
- $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataStaged !== null) {
- $xfer += $output->writeFieldBegin('dataStaged', TType::BOOL, 11);
- $xfer += $output->writeBool($this->dataStaged);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
- * Application Outputs. The paramters describe how outputs generated by the application.
- *
- * name:
- * Name of the parameter.
- *
- * value:
- * Value of the parameter.
- *
- * type:
- * Data type of the parameter
- *
- * applicationArguement:
- * The argument flag sent to the application. Such as -p pressure.
- *
- * standardInput:
- * When this value is set, the parameter is sent as standard input rather than a parameter.
- * Typically this is passed using redirection operator ">".
- *
- * userFriendlyDescription:
- * Description to be displayed at the user interface.
- *
- * metaData:
- * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
- *
- */
-class OutputDataObjectType {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $name = null;
- /**
- * @var string
- */
- public $value = null;
- /**
- * @var int
- */
- public $type = null;
- /**
- * @var string
- */
- public $applicationArgument = null;
- /**
- * @var bool
- */
- public $isRequired = null;
- /**
- * @var bool
- */
- public $requiredToAddedToCommandLine = null;
- /**
- * @var bool
- */
- public $dataMovement = null;
- /**
- * @var string
- */
- public $location = null;
- /**
- * @var string
- */
- public $searchQuery = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'name',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'value',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'type',
- 'type' => TType::I32,
- ),
- 4 => array(
- 'var' => 'applicationArgument',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'isRequired',
- 'type' => TType::BOOL,
- ),
- 6 => array(
- 'var' => 'requiredToAddedToCommandLine',
- 'type' => TType::BOOL,
- ),
- 7 => array(
- 'var' => 'dataMovement',
- 'type' => TType::BOOL,
- ),
- 8 => array(
- 'var' => 'location',
- 'type' => TType::STRING,
- ),
- 9 => array(
- 'var' => 'searchQuery',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['name'])) {
- $this->name = $vals['name'];
- }
- if (isset($vals['value'])) {
- $this->value = $vals['value'];
- }
- if (isset($vals['type'])) {
- $this->type = $vals['type'];
- }
- if (isset($vals['applicationArgument'])) {
- $this->applicationArgument = $vals['applicationArgument'];
- }
- if (isset($vals['isRequired'])) {
- $this->isRequired = $vals['isRequired'];
- }
- if (isset($vals['requiredToAddedToCommandLine'])) {
- $this->requiredToAddedToCommandLine = $vals['requiredToAddedToCommandLine'];
- }
- if (isset($vals['dataMovement'])) {
- $this->dataMovement = $vals['dataMovement'];
- }
- if (isset($vals['location'])) {
- $this->location = $vals['location'];
- }
- if (isset($vals['searchQuery'])) {
- $this->searchQuery = $vals['searchQuery'];
- }
- }
- }
-
- public function getName() {
- return 'OutputDataObjectType';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->name);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->value);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->type);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->applicationArgument);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->isRequired);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->requiredToAddedToCommandLine);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->dataMovement);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 8:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->location);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->searchQuery);
- } 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('OutputDataObjectType');
- if ($this->name !== null) {
- $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
- $xfer += $output->writeString($this->name);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->value !== null) {
- $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
- $xfer += $output->writeString($this->value);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->type !== null) {
- $xfer += $output->writeFieldBegin('type', TType::I32, 3);
- $xfer += $output->writeI32($this->type);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->applicationArgument !== null) {
- $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4);
- $xfer += $output->writeString($this->applicationArgument);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->isRequired !== null) {
- $xfer += $output->writeFieldBegin('isRequired', TType::BOOL, 5);
- $xfer += $output->writeBool($this->isRequired);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->requiredToAddedToCommandLine !== null) {
- $xfer += $output->writeFieldBegin('requiredToAddedToCommandLine', TType::BOOL, 6);
- $xfer += $output->writeBool($this->requiredToAddedToCommandLine);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataMovement !== null) {
- $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 7);
- $xfer += $output->writeBool($this->dataMovement);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->location !== null) {
- $xfer += $output->writeFieldBegin('location', TType::STRING, 8);
- $xfer += $output->writeString($this->location);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->searchQuery !== null) {
- $xfer += $output->writeFieldBegin('searchQuery', TType::STRING, 9);
- $xfer += $output->writeString($this->searchQuery);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
* Application Interface Description
*
* applicationModules:
@@ -687,11 +50,11 @@ class ApplicationInterfaceDescription {
*/
public $applicationModules = null;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\InputDataObjectType[]
*/
public $applicationInputs = null;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $applicationOutputs = null;
@@ -724,7 +87,7 @@ class ApplicationInterfaceDescription {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
),
),
6 => array(
@@ -733,7 +96,7 @@ class ApplicationInterfaceDescription {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
);
@@ -826,7 +189,7 @@ class ApplicationInterfaceDescription {
for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
{
$elem11 = null;
- $elem11 = new \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType();
+ $elem11 = new \Airavata\Model\Application\Io\InputDataObjectType();
$xfer += $elem11->read($input);
$this->applicationInputs []= $elem11;
}
@@ -844,7 +207,7 @@ class ApplicationInterfaceDescription {
for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
{
$elem17 = null;
- $elem17 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+ $elem17 = new \Airavata\Model\Application\Io\OutputDataObjectType();
$xfer += $elem17->read($input);
$this->applicationOutputs []= $elem17;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
index 1602ceb..d6a9711 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
@@ -170,230 +170,6 @@ class ExperimentStatusChangeEvent {
}
-class WorkflowIdentifier {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $workflowNodeId = null;
- /**
- * @var string
- */
- public $experimentId = null;
- /**
- * @var string
- */
- public $gatewayId = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'workflowNodeId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'experimentId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['workflowNodeId'])) {
- $this->workflowNodeId = $vals['workflowNodeId'];
- }
- if (isset($vals['experimentId'])) {
- $this->experimentId = $vals['experimentId'];
- }
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- }
- }
-
- public function getName() {
- return 'WorkflowIdentifier';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->workflowNodeId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->experimentId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } 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('WorkflowIdentifier');
- if ($this->workflowNodeId !== null) {
- $xfer += $output->writeFieldBegin('workflowNodeId', TType::STRING, 1);
- $xfer += $output->writeString($this->workflowNodeId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->experimentId !== null) {
- $xfer += $output->writeFieldBegin('experimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->experimentId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class WorkflowNodeStatusChangeEvent {
- static $_TSPEC;
-
- /**
- * @var int
- */
- public $state = null;
- /**
- * @var \Airavata\Model\Messaging\Event\WorkflowIdentifier
- */
- public $workflowNodeIdentity = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'state',
- 'type' => TType::I32,
- ),
- 2 => array(
- 'var' => 'workflowNodeIdentity',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Messaging\Event\WorkflowIdentifier',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['state'])) {
- $this->state = $vals['state'];
- }
- if (isset($vals['workflowNodeIdentity'])) {
- $this->workflowNodeIdentity = $vals['workflowNodeIdentity'];
- }
- }
- }
-
- public function getName() {
- return 'WorkflowNodeStatusChangeEvent';
- }
-
- 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::I32) {
- $xfer += $input->readI32($this->state);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->workflowNodeIdentity = new \Airavata\Model\Messaging\Event\WorkflowIdentifier();
- $xfer += $this->workflowNodeIdentity->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('WorkflowNodeStatusChangeEvent');
- if ($this->state !== null) {
- $xfer += $output->writeFieldBegin('state', TType::I32, 1);
- $xfer += $output->writeI32($this->state);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->workflowNodeIdentity !== null) {
- if (!is_object($this->workflowNodeIdentity)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('workflowNodeIdentity', TType::STRUCT, 2);
- $xfer += $this->workflowNodeIdentity->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
class TaskIdentifier {
static $_TSPEC;
@@ -748,7 +524,7 @@ class TaskOutputChangeEvent {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $output = null;
/**
@@ -765,7 +541,7 @@ class TaskOutputChangeEvent {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
2 => array(
@@ -813,7 +589,7 @@ class TaskOutputChangeEvent {
for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
{
$elem5 = null;
- $elem5 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+ $elem5 = new \Airavata\Model\Application\Io\OutputDataObjectType();
$xfer += $elem5->read($input);
$this->output []= $elem5;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
index 15ba747..21d877c 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Types.php
@@ -37,11 +37,11 @@ class Workflow {
*/
public $image = null;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\InputDataObjectType[]
*/
public $workflowInputs = null;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $workflowOutputs = null;
@@ -70,7 +70,7 @@ class Workflow {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
),
),
6 => array(
@@ -79,7 +79,7 @@ class Workflow {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
);
@@ -162,7 +162,7 @@ class Workflow {
for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
{
$elem5 = null;
- $elem5 = new \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType();
+ $elem5 = new \Airavata\Model\Application\Io\InputDataObjectType();
$xfer += $elem5->read($input);
$this->workflowInputs []= $elem5;
}
@@ -180,7 +180,7 @@ class Workflow {
for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
{
$elem11 = null;
- $elem11 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+ $elem11 = new \Airavata\Model\Application\Io\OutputDataObjectType();
$xfer += $elem11->read($input);
$this->workflowOutputs []= $elem11;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
index d44ae02..458f6ea 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php
@@ -121,7 +121,7 @@ class Project {
/**
* @var string
*/
- public $projectID = "DEFAULT";
+ public $projectID = null;
/**
* @var string
*/
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 32e03f8..057b583 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
@@ -60,11 +60,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' getAllExperimentsInProjectWithPagination(string projectId, i32 limit, i32 offset)')
print(' getAllUserExperiments(string gatewayId, string userName)')
print(' getAllUserExperimentsWithPagination(string gatewayId, string userName, i32 limit, i32 offset)')
- print(' string createExperiment(string gatewayId, Experiment experiment)')
- print(' Experiment getExperiment(string airavataExperimentId)')
- print(' void updateExperiment(string airavataExperimentId, Experiment experiment)')
- print(' void updateExperimentConfiguration(string airavataExperimentId, UserConfigurationData userConfiguration)')
- print(' void updateResourceScheduleing(string airavataExperimentId, ComputationalResourceScheduling resourceScheduling)')
+ print(' string createExperiment(string gatewayId, ExperimentModel experiment)')
+ print(' ExperimentModel getExperiment(string airavataExperimentId)')
+ print(' void updateExperiment(string airavataExperimentId, ExperimentModel experiment)')
+ print(' void updateExperimentConfiguration(string airavataExperimentId, UserConfigurationDataModel userConfiguration)')
+ print(' void updateResourceScheduleing(string airavataExperimentId, ComputationalResourceSchedulingModel resourceScheduling)')
print(' bool validateExperiment(string airavataExperimentId)')
print(' void launchExperiment(string airavataExperimentId, string airavataCredStoreToken)')
print(' ExperimentStatus getExperimentStatus(string airavataExperimentId)')
@@ -72,7 +72,6 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' getIntermediateOutputs(string airavataExperimentId)')
print(' getJobStatuses(string airavataExperimentId)')
print(' getJobDetails(string airavataExperimentId)')
- print(' getDataTransferDetails(string airavataExperimentId)')
print(' string cloneExperiment(string existingExperimentID, string newExperimentName)')
print(' void terminateExperiment(string airavataExperimentId, string tokenId)')
print(' string registerApplicationModule(string gatewayId, ApplicationModule applicationModule)')
@@ -496,12 +495,6 @@ elif cmd == 'getJobDetails':
sys.exit(1)
pp.pprint(client.getJobDetails(args[0],))
-elif cmd == 'getDataTransferDetails':
- if len(args) != 1:
- print('getDataTransferDetails requires 1 args')
- sys.exit(1)
- pp.pprint(client.getDataTransferDetails(args[0],))
-
elif cmd == 'cloneExperiment':
if len(args) != 2:
print('cloneExperiment requires 2 args')
[07/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 984ee48..8fe34f7 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
@@ -317,7 +317,7 @@ interface AiravataIf {
* @param string $gatewayId
* @param string $userName
* @param string $expName
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -343,7 +343,7 @@ interface AiravataIf {
* @param string $expName
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -364,7 +364,7 @@ interface AiravataIf {
* @param string $gatewayId
* @param string $userName
* @param string $description
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -390,7 +390,7 @@ interface AiravataIf {
* @param string $description
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -411,7 +411,7 @@ interface AiravataIf {
* @param string $gatewayId
* @param string $userName
* @param string $applicationId
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -437,7 +437,7 @@ interface AiravataIf {
* @param string $applicationId
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -458,7 +458,7 @@ interface AiravataIf {
* @param string $gatewayId
* @param string $userName
* @param int $experimentState
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -484,7 +484,7 @@ interface AiravataIf {
* @param int $experimentState
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -508,7 +508,7 @@ interface AiravataIf {
* @param string $userName
* @param int $fromTime
* @param int $toTime
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -537,7 +537,7 @@ interface AiravataIf {
* @param int $toTime
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -563,7 +563,7 @@ interface AiravataIf {
* @param array $filters
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @return \Airavata\Model\Experiment\ExperimentSummaryModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -582,7 +582,7 @@ interface AiravataIf {
* @param string $gatewayId
* @param int $fromTime
* @param int $toTime
- * @return \Airavata\Model\Workspace\Experiment\ExperimentStatistics
+ * @return \Airavata\Model\Experiment\ExperimentStatistics
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -597,7 +597,7 @@ interface AiravataIf {
* Instead use getAllExperimentsInProjectWithPagination
*
* @param string $projectId
- * @return \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @return \Airavata\Model\Experiment\ExperimentModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -618,7 +618,7 @@ interface AiravataIf {
* @param string $projectId
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @return \Airavata\Model\Experiment\ExperimentModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -637,7 +637,7 @@ interface AiravataIf {
*
* @param string $gatewayId
* @param string $userName
- * @return \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @return \Airavata\Model\Experiment\ExperimentModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -660,7 +660,7 @@ interface AiravataIf {
* @param string $userName
* @param int $limit
* @param int $offset
- * @return \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @return \Airavata\Model\Experiment\ExperimentModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -702,13 +702,13 @@ interface AiravataIf {
*
*
* @param string $gatewayId
- * @param \Airavata\Model\Workspace\Experiment\Experiment $experiment
+ * @param \Airavata\Model\Experiment\ExperimentModel $experiment
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
*/
- public function createExperiment($gatewayId, \Airavata\Model\Workspace\Experiment\Experiment $experiment);
+ public function createExperiment($gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment);
/**
* Fetch previously created experiment metadata.
*
@@ -743,7 +743,7 @@ interface AiravataIf {
*
*
* @param string $airavataExperimentId
- * @return \Airavata\Model\Workspace\Experiment\Experiment A structure holding the experiment metadata and its child models.
+ * @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.
@@ -804,23 +804,23 @@ interface AiravataIf {
*
*
* @param string $airavataExperimentId
- * @param \Airavata\Model\Workspace\Experiment\Experiment $experiment
+ * @param \Airavata\Model\Experiment\ExperimentModel $experiment
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
*/
- public function updateExperiment($airavataExperimentId, \Airavata\Model\Workspace\Experiment\Experiment $experiment);
+ public function updateExperiment($airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment);
/**
* @param string $airavataExperimentId
- * @param \Airavata\Model\Workspace\Experiment\UserConfigurationData $userConfiguration
+ * @param \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration
*/
- public function updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Workspace\Experiment\UserConfigurationData $userConfiguration);
+ public function updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration);
/**
* @param string $airavataExperimentId
- * @param \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling $resourceScheduling
+ * @param \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling
*/
- public function updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling $resourceScheduling);
+ public function updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling);
/**
* *
* * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
@@ -887,12 +887,22 @@ interface AiravataIf {
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\LaunchValidationException
*/
public function launchExperiment($airavataExperimentId, $airavataCredStoreToken);
/**
* @param string $airavataExperimentId
- * @return \Airavata\Model\Workspace\Experiment\ExperimentStatus
+ * @return \Airavata\Model\Status\ExperimentStatus Status: A generic status object.
+ *
+ * state:
+ * State .
+ *
+ * timeOfStateChange:
+ * time the status was last updated.
+ *
+ * reason:
+ * User friendly reason on how the state is inferred.
+ *
+ *
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
@@ -901,7 +911,7 @@ interface AiravataIf {
public function getExperimentStatus($airavataExperimentId);
/**
* @param string $airavataExperimentId
- * @return \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @return \Airavata\Model\Application\Io\OutputDataObjectType[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
@@ -910,7 +920,7 @@ interface AiravataIf {
public function getExperimentOutputs($airavataExperimentId);
/**
* @param string $airavataExperimentId
- * @return \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @return \Airavata\Model\Application\Io\OutputDataObjectType[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
@@ -928,7 +938,7 @@ interface AiravataIf {
public function getJobStatuses($airavataExperimentId);
/**
* @param string $airavataExperimentId
- * @return \Airavata\Model\Workspace\Experiment\JobDetails[]
+ * @return \Airavata\Model\job\JobModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
@@ -936,15 +946,6 @@ interface AiravataIf {
*/
public function getJobDetails($airavataExperimentId);
/**
- * @param string $airavataExperimentId
- * @return \Airavata\Model\Workspace\Experiment\DataTransferDetails[]
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\ExperimentNotFoundException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- */
- public function getDataTransferDetails($airavataExperimentId);
- /**
* Clone an specified experiment with a new name. A copy of the experiment configuration is made and is persisted with new metadata.
* The client has to subsequently update this configuration if needed and launch the cloned experiment.
*
@@ -1383,7 +1384,7 @@ interface AiravataIf {
*
*
* @param string $appInterfaceId
- * @return \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+ * @return \Airavata\Model\Application\Io\InputDataObjectType[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -1400,7 +1401,7 @@ interface AiravataIf {
*
*
* @param string $appInterfaceId
- * @return \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @return \Airavata\Model\Application\Io\OutputDataObjectType[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -4732,13 +4733,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getAllUserExperimentsWithPagination failed: unknown result");
}
- public function createExperiment($gatewayId, \Airavata\Model\Workspace\Experiment\Experiment $experiment)
+ public function createExperiment($gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
$this->send_createExperiment($gatewayId, $experiment);
return $this->recv_createExperiment();
}
- public function send_createExperiment($gatewayId, \Airavata\Model\Workspace\Experiment\Experiment $experiment)
+ public function send_createExperiment($gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
$args = new \Airavata\API\Airavata_createExperiment_args();
$args->gatewayId = $gatewayId;
@@ -4856,13 +4857,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getExperiment failed: unknown result");
}
- public function updateExperiment($airavataExperimentId, \Airavata\Model\Workspace\Experiment\Experiment $experiment)
+ public function updateExperiment($airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
$this->send_updateExperiment($airavataExperimentId, $experiment);
$this->recv_updateExperiment();
}
- public function send_updateExperiment($airavataExperimentId, \Airavata\Model\Workspace\Experiment\Experiment $experiment)
+ public function send_updateExperiment($airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
$args = new \Airavata\API\Airavata_updateExperiment_args();
$args->airavataExperimentId = $airavataExperimentId;
@@ -4917,13 +4918,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
return;
}
- public function updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Workspace\Experiment\UserConfigurationData $userConfiguration)
+ public function updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
$this->send_updateExperimentConfiguration($airavataExperimentId, $userConfiguration);
$this->recv_updateExperimentConfiguration();
}
- public function send_updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Workspace\Experiment\UserConfigurationData $userConfiguration)
+ public function send_updateExperimentConfiguration($airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
$args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
$args->airavataExperimentId = $airavataExperimentId;
@@ -4966,13 +4967,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
return;
}
- public function updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling $resourceScheduling)
+ public function updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
$this->send_updateResourceScheduleing($airavataExperimentId, $resourceScheduling);
$this->recv_updateResourceScheduleing();
}
- public function send_updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling $resourceScheduling)
+ public function send_updateResourceScheduleing($airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
$args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
$args->airavataExperimentId = $airavataExperimentId;
@@ -5136,9 +5137,6 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ase !== null) {
throw $result->ase;
}
- if ($result->lve !== null) {
- throw $result->lve;
- }
return;
}
@@ -5457,69 +5455,6 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getJobDetails failed: unknown result");
}
- public function getDataTransferDetails($airavataExperimentId)
- {
- $this->send_getDataTransferDetails($airavataExperimentId);
- return $this->recv_getDataTransferDetails();
- }
-
- public function send_getDataTransferDetails($airavataExperimentId)
- {
- $args = new \Airavata\API\Airavata_getDataTransferDetails_args();
- $args->airavataExperimentId = $airavataExperimentId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getDataTransferDetails', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getDataTransferDetails', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getDataTransferDetails()
- {
- $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_getDataTransferDetails_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_getDataTransferDetails_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;
- }
- throw new \Exception("getDataTransferDetails failed: unknown result");
- }
-
public function cloneExperiment($existingExperimentID, $newExperimentName)
{
$this->send_cloneExperiment($existingExperimentID, $newExperimentName);
@@ -15686,7 +15621,7 @@ class Airavata_searchExperimentsByName_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -15711,7 +15646,7 @@ class Airavata_searchExperimentsByName_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -15775,7 +15710,7 @@ class Airavata_searchExperimentsByName_result {
for ($_i62 = 0; $_i62 < $_size58; ++$_i62)
{
$elem63 = null;
- $elem63 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem63->read($input);
$this->success []= $elem63;
}
@@ -16031,7 +15966,7 @@ class Airavata_searchExperimentsByNameWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -16056,7 +15991,7 @@ class Airavata_searchExperimentsByNameWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -16120,7 +16055,7 @@ class Airavata_searchExperimentsByNameWithPagination_result {
for ($_i69 = 0; $_i69 < $_size65; ++$_i69)
{
$elem70 = null;
- $elem70 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem70->read($input);
$this->success []= $elem70;
}
@@ -16330,7 +16265,7 @@ class Airavata_searchExperimentsByDesc_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -16355,7 +16290,7 @@ class Airavata_searchExperimentsByDesc_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -16419,7 +16354,7 @@ class Airavata_searchExperimentsByDesc_result {
for ($_i76 = 0; $_i76 < $_size72; ++$_i76)
{
$elem77 = null;
- $elem77 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem77 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem77->read($input);
$this->success []= $elem77;
}
@@ -16675,7 +16610,7 @@ class Airavata_searchExperimentsByDescWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -16700,7 +16635,7 @@ class Airavata_searchExperimentsByDescWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -16764,7 +16699,7 @@ class Airavata_searchExperimentsByDescWithPagination_result {
for ($_i83 = 0; $_i83 < $_size79; ++$_i83)
{
$elem84 = null;
- $elem84 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem84 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem84->read($input);
$this->success []= $elem84;
}
@@ -16974,7 +16909,7 @@ class Airavata_searchExperimentsByApplication_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -16999,7 +16934,7 @@ class Airavata_searchExperimentsByApplication_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -17063,7 +16998,7 @@ class Airavata_searchExperimentsByApplication_result {
for ($_i90 = 0; $_i90 < $_size86; ++$_i90)
{
$elem91 = null;
- $elem91 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem91 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem91->read($input);
$this->success []= $elem91;
}
@@ -17319,7 +17254,7 @@ class Airavata_searchExperimentsByApplicationWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -17344,7 +17279,7 @@ class Airavata_searchExperimentsByApplicationWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -17408,7 +17343,7 @@ class Airavata_searchExperimentsByApplicationWithPagination_result {
for ($_i97 = 0; $_i97 < $_size93; ++$_i97)
{
$elem98 = null;
- $elem98 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem98 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem98->read($input);
$this->success []= $elem98;
}
@@ -17618,7 +17553,7 @@ class Airavata_searchExperimentsByStatus_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -17643,7 +17578,7 @@ class Airavata_searchExperimentsByStatus_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -17707,7 +17642,7 @@ class Airavata_searchExperimentsByStatus_result {
for ($_i104 = 0; $_i104 < $_size100; ++$_i104)
{
$elem105 = null;
- $elem105 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem105 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem105->read($input);
$this->success []= $elem105;
}
@@ -17963,7 +17898,7 @@ class Airavata_searchExperimentsByStatusWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -17988,7 +17923,7 @@ class Airavata_searchExperimentsByStatusWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -18052,7 +17987,7 @@ class Airavata_searchExperimentsByStatusWithPagination_result {
for ($_i111 = 0; $_i111 < $_size107; ++$_i111)
{
$elem112 = null;
- $elem112 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem112 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem112->read($input);
$this->success []= $elem112;
}
@@ -18285,7 +18220,7 @@ class Airavata_searchExperimentsByCreationTime_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -18310,7 +18245,7 @@ class Airavata_searchExperimentsByCreationTime_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -18374,7 +18309,7 @@ class Airavata_searchExperimentsByCreationTime_result {
for ($_i118 = 0; $_i118 < $_size114; ++$_i118)
{
$elem119 = null;
- $elem119 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem119 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem119->read($input);
$this->success []= $elem119;
}
@@ -18653,7 +18588,7 @@ class Airavata_searchExperimentsByCreationTimeWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -18678,7 +18613,7 @@ class Airavata_searchExperimentsByCreationTimeWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -18742,7 +18677,7 @@ class Airavata_searchExperimentsByCreationTimeWithPagination_result {
for ($_i125 = 0; $_i125 < $_size121; ++$_i125)
{
$elem126 = null;
- $elem126 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem126 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem126->read($input);
$this->success []= $elem126;
}
@@ -19032,7 +18967,7 @@ class Airavata_searchExperiments_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentSummary[]
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -19057,7 +18992,7 @@ class Airavata_searchExperiments_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentSummary',
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
),
),
1 => array(
@@ -19121,7 +19056,7 @@ class Airavata_searchExperiments_result {
for ($_i141 = 0; $_i141 < $_size137; ++$_i141)
{
$elem142 = null;
- $elem142 = new \Airavata\Model\Workspace\Experiment\ExperimentSummary();
+ $elem142 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
$xfer += $elem142->read($input);
$this->success []= $elem142;
}
@@ -19331,7 +19266,7 @@ class Airavata_getExperimentStatistics_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentStatistics
+ * @var \Airavata\Model\Experiment\ExperimentStatistics
*/
public $success = null;
/**
@@ -19353,7 +19288,7 @@ class Airavata_getExperimentStatistics_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentStatistics',
+ 'class' => '\Airavata\Model\Experiment\ExperimentStatistics',
),
1 => array(
'var' => 'ire',
@@ -19409,7 +19344,7 @@ class Airavata_getExperimentStatistics_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Experiment\ExperimentStatistics();
+ $this->success = new \Airavata\Model\Experiment\ExperimentStatistics();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -19561,7 +19496,7 @@ class Airavata_getAllExperimentsInProject_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -19590,7 +19525,7 @@ class Airavata_getAllExperimentsInProject_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -19662,7 +19597,7 @@ class Airavata_getAllExperimentsInProject_result {
for ($_i148 = 0; $_i148 < $_size144; ++$_i148)
{
$elem149 = null;
- $elem149 = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $elem149 = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $elem149->read($input);
$this->success []= $elem149;
}
@@ -19885,7 +19820,7 @@ class Airavata_getAllExperimentsInProjectWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -19914,7 +19849,7 @@ class Airavata_getAllExperimentsInProjectWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -19986,7 +19921,7 @@ class Airavata_getAllExperimentsInProjectWithPagination_result {
for ($_i155 = 0; $_i155 < $_size151; ++$_i155)
{
$elem156 = null;
- $elem156 = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $elem156 = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $elem156->read($input);
$this->success []= $elem156;
}
@@ -20186,7 +20121,7 @@ class Airavata_getAllUserExperiments_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -20211,7 +20146,7 @@ class Airavata_getAllUserExperiments_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -20275,7 +20210,7 @@ class Airavata_getAllUserExperiments_result {
for ($_i162 = 0; $_i162 < $_size158; ++$_i162)
{
$elem163 = null;
- $elem163 = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $elem163 = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $elem163->read($input);
$this->success []= $elem163;
}
@@ -20508,7 +20443,7 @@ class Airavata_getAllUserExperimentsWithPagination_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -20533,7 +20468,7 @@ class Airavata_getAllUserExperimentsWithPagination_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -20597,7 +20532,7 @@ class Airavata_getAllUserExperimentsWithPagination_result {
for ($_i169 = 0; $_i169 < $_size165; ++$_i169)
{
$elem170 = null;
- $elem170 = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $elem170 = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $elem170->read($input);
$this->success []= $elem170;
}
@@ -20690,7 +20625,7 @@ class Airavata_createExperiment_args {
*/
public $gatewayId = null;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment
+ * @var \Airavata\Model\Experiment\ExperimentModel
*/
public $experiment = null;
@@ -20704,7 +20639,7 @@ class Airavata_createExperiment_args {
2 => array(
'var' => 'experiment',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
);
}
@@ -20746,7 +20681,7 @@ class Airavata_createExperiment_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->experiment = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $this->experiment = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $this->experiment->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -21014,7 +20949,7 @@ class Airavata_getExperiment_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment
+ * @var \Airavata\Model\Experiment\ExperimentModel
*/
public $success = null;
/**
@@ -21040,7 +20975,7 @@ class Airavata_getExperiment_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
1 => array(
'var' => 'ire',
@@ -21104,7 +21039,7 @@ class Airavata_getExperiment_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $this->success = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -21198,7 +21133,7 @@ class Airavata_updateExperiment_args {
*/
public $airavataExperimentId = null;
/**
- * @var \Airavata\Model\Workspace\Experiment\Experiment
+ * @var \Airavata\Model\Experiment\ExperimentModel
*/
public $experiment = null;
@@ -21212,7 +21147,7 @@ class Airavata_updateExperiment_args {
2 => array(
'var' => 'experiment',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\Experiment',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
);
}
@@ -21254,7 +21189,7 @@ class Airavata_updateExperiment_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->experiment = new \Airavata\Model\Workspace\Experiment\Experiment();
+ $this->experiment = new \Airavata\Model\Experiment\ExperimentModel();
$xfer += $this->experiment->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -21453,7 +21388,7 @@ class Airavata_updateExperimentConfiguration_args {
*/
public $airavataExperimentId = null;
/**
- * @var \Airavata\Model\Workspace\Experiment\UserConfigurationData
+ * @var \Airavata\Model\Experiment\UserConfigurationDataModel
*/
public $userConfiguration = null;
@@ -21467,7 +21402,7 @@ class Airavata_updateExperimentConfiguration_args {
2 => array(
'var' => 'userConfiguration',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\UserConfigurationData',
+ 'class' => '\Airavata\Model\Experiment\UserConfigurationDataModel',
),
);
}
@@ -21509,7 +21444,7 @@ class Airavata_updateExperimentConfiguration_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->userConfiguration = new \Airavata\Model\Workspace\Experiment\UserConfigurationData();
+ $this->userConfiguration = new \Airavata\Model\Experiment\UserConfigurationDataModel();
$xfer += $this->userConfiguration->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -21606,7 +21541,7 @@ class Airavata_updateResourceScheduleing_args {
*/
public $airavataExperimentId = null;
/**
- * @var \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling
+ * @var \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel
*/
public $resourceScheduling = null;
@@ -21620,7 +21555,7 @@ class Airavata_updateResourceScheduleing_args {
2 => array(
'var' => 'resourceScheduling',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling',
+ 'class' => '\Airavata\Model\Scheduling\ComputationalResourceSchedulingModel',
),
);
}
@@ -21662,7 +21597,7 @@ class Airavata_updateResourceScheduleing_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->resourceScheduling = new \Airavata\Model\Workspace\Experiment\ComputationalResourceScheduling();
+ $this->resourceScheduling = new \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel();
$xfer += $this->resourceScheduling->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -22118,10 +22053,6 @@ class Airavata_launchExperiment_result {
* @var \Airavata\API\Error\AiravataSystemException
*/
public $ase = null;
- /**
- * @var \Airavata\API\Error\LaunchValidationException
- */
- public $lve = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -22146,11 +22077,6 @@ class Airavata_launchExperiment_result {
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AiravataSystemException',
),
- 5 => array(
- 'var' => 'lve',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\LaunchValidationException',
- ),
);
}
if (is_array($vals)) {
@@ -22166,9 +22092,6 @@ class Airavata_launchExperiment_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
- if (isset($vals['lve'])) {
- $this->lve = $vals['lve'];
- }
}
}
@@ -22223,14 +22146,6 @@ class Airavata_launchExperiment_result {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRUCT) {
- $this->lve = new \Airavata\API\Error\LaunchValidationException();
- $xfer += $this->lve->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -22264,11 +22179,6 @@ class Airavata_launchExperiment_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->lve !== null) {
- $xfer += $output->writeFieldBegin('lve', TType::STRUCT, 5);
- $xfer += $this->lve->write($output);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -22355,7 +22265,7 @@ class Airavata_getExperimentStatus_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\ExperimentStatus
+ * @var \Airavata\Model\Status\ExperimentStatus
*/
public $success = null;
/**
@@ -22381,7 +22291,7 @@ class Airavata_getExperimentStatus_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\ExperimentStatus',
+ 'class' => '\Airavata\Model\Status\ExperimentStatus',
),
1 => array(
'var' => 'ire',
@@ -22445,7 +22355,7 @@ class Airavata_getExperimentStatus_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Experiment\ExperimentStatus();
+ $this->success = new \Airavata\Model\Status\ExperimentStatus();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -22610,7 +22520,7 @@ class Airavata_getExperimentOutputs_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $success = null;
/**
@@ -22639,7 +22549,7 @@ class Airavata_getExperimentOutputs_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
1 => array(
@@ -22711,7 +22621,7 @@ class Airavata_getExperimentOutputs_result {
for ($_i176 = 0; $_i176 < $_size172; ++$_i176)
{
$elem177 = null;
- $elem177 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+ $elem177 = new \Airavata\Model\Application\Io\OutputDataObjectType();
$xfer += $elem177->read($input);
$this->success []= $elem177;
}
@@ -22888,7 +22798,7 @@ class Airavata_getIntermediateOutputs_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $success = null;
/**
@@ -22917,7 +22827,7 @@ class Airavata_getIntermediateOutputs_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
1 => array(
@@ -22989,7 +22899,7 @@ class Airavata_getIntermediateOutputs_result {
for ($_i183 = 0; $_i183 < $_size179; ++$_i183)
{
$elem184 = null;
- $elem184 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
+ $elem184 = new \Airavata\Model\Application\Io\OutputDataObjectType();
$xfer += $elem184->read($input);
$this->success []= $elem184;
}
@@ -23199,7 +23109,7 @@ class Airavata_getJobStatuses_result {
),
'val' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\JobStatus',
+ 'class' => '\Airavata\Model\Status\JobStatus',
),
),
1 => array(
@@ -23272,9 +23182,9 @@ class Airavata_getJobStatuses_result {
for ($_i190 = 0; $_i190 < $_size186; ++$_i190)
{
$key191 = '';
- $val192 = new \Airavata\Model\Workspace\Experiment\JobStatus();
+ $val192 = new \Airavata\Model\Status\JobStatus();
$xfer += $input->readString($key191);
- $val192 = new \Airavata\Model\Workspace\Experiment\JobStatus();
+ $val192 = new \Airavata\Model\Status\JobStatus();
$xfer += $val192->read($input);
$this->success[$key191] = $val192;
}
@@ -23452,7 +23362,7 @@ class Airavata_getJobDetails_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Experiment\JobDetails[]
+ * @var \Airavata\Model\job\JobModel[]
*/
public $success = null;
/**
@@ -23481,7 +23391,7 @@ class Airavata_getJobDetails_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\JobDetails',
+ 'class' => '\Airavata\Model\job\JobModel',
),
),
1 => array(
@@ -23553,7 +23463,7 @@ class Airavata_getJobDetails_result {
for ($_i199 = 0; $_i199 < $_size195; ++$_i199)
{
$elem200 = null;
- $elem200 = new \Airavata\Model\Workspace\Experiment\JobDetails();
+ $elem200 = new \Airavata\Model\job\JobModel();
$xfer += $elem200->read($input);
$this->success []= $elem200;
}
@@ -23651,284 +23561,6 @@ class Airavata_getJobDetails_result {
}
-class Airavata_getDataTransferDetails_args {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $airavataExperimentId = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getDataTransferDetails_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::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_getDataTransferDetails_args');
- if ($this->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 1);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getDataTransferDetails_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Experiment\DataTransferDetails[]
- */
- 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;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Experiment\DataTransferDetails',
- ),
- ),
- 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',
- ),
- );
- }
- 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'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getDataTransferDetails_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size202 = 0;
- $_etype205 = 0;
- $xfer += $input->readListBegin($_etype205, $_size202);
- for ($_i206 = 0; $_i206 < $_size202; ++$_i206)
- {
- $elem207 = null;
- $elem207 = new \Airavata\Model\Workspace\Experiment\DataTransferDetails();
- $xfer += $elem207->read($input);
- $this->success []= $elem207;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->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;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getDataTransferDetails_result');
- if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter208)
- {
- $xfer += $iter208->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->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();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
class Airavata_cloneExperiment_args {
static $_TSPEC;
@@ -25350,15 +24982,15 @@ class Airavata_getAllAppModules_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size209 = 0;
- $_etype212 = 0;
- $xfer += $input->readListBegin($_etype212, $_size209);
- for ($_i213 = 0; $_i213 < $_size209; ++$_i213)
+ $_size202 = 0;
+ $_etype205 = 0;
+ $xfer += $input->readListBegin($_etype205, $_size202);
+ for ($_i206 = 0; $_i206 < $_size202; ++$_i206)
{
- $elem214 = null;
- $elem214 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
- $xfer += $elem214->read($input);
- $this->success []= $elem214;
+ $elem207 = null;
+ $elem207 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule();
+ $xfer += $elem207->read($input);
+ $this->success []= $elem207;
}
$xfer += $input->readListEnd();
} else {
@@ -25410,9 +25042,9 @@ class Airavata_getAllAppModules_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter215)
+ foreach ($this->success as $iter208)
{
- $xfer += $iter215->write($output);
+ $xfer += $iter208->write($output);
}
}
$output->writeListEnd();
@@ -26789,15 +26421,15 @@ class Airavata_getAllApplicationDeployments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size216 = 0;
- $_etype219 = 0;
- $xfer += $input->readListBegin($_etype219, $_size216);
- for ($_i220 = 0; $_i220 < $_size216; ++$_i220)
+ $_size209 = 0;
+ $_etype212 = 0;
+ $xfer += $input->readListBegin($_etype212, $_size209);
+ for ($_i213 = 0; $_i213 < $_size209; ++$_i213)
{
- $elem221 = null;
- $elem221 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
- $xfer += $elem221->read($input);
- $this->success []= $elem221;
+ $elem214 = null;
+ $elem214 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription();
+ $xfer += $elem214->read($input);
+ $this->success []= $elem214;
}
$xfer += $input->readListEnd();
} else {
@@ -26849,9 +26481,9 @@ class Airavata_getAllApplicationDeployments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter222)
+ foreach ($this->success as $iter215)
{
- $xfer += $iter222->write($output);
+ $xfer += $iter215->write($output);
}
}
$output->writeListEnd();
@@ -27041,14 +26673,14 @@ class Airavata_getAppModuleDeployedResources_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size223 = 0;
- $_etype226 = 0;
- $xfer += $input->readListBegin($_etype226, $_size223);
- for ($_i227 = 0; $_i227 < $_size223; ++$_i227)
+ $_size216 = 0;
+ $_etype219 = 0;
+ $xfer += $input->readListBegin($_etype219, $_size216);
+ for ($_i220 = 0; $_i220 < $_size216; ++$_i220)
{
- $elem228 = null;
- $xfer += $input->readString($elem228);
- $this->success []= $elem228;
+ $elem221 = null;
+ $xfer += $input->readString($elem221);
+ $this->success []= $elem221;
}
$xfer += $input->readListEnd();
} else {
@@ -27100,9 +26732,9 @@ class Airavata_getAppModuleDeployedResources_result {
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter229)
+ foreach ($this->success as $iter222)
{
- $xfer += $output->writeString($iter229);
+ $xfer += $output->writeString($iter222);
}
}
$output->writeListEnd();
@@ -28257,17 +27889,17 @@ class Airavata_getAllApplicationInterfaceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size230 = 0;
- $_ktype231 = 0;
- $_vtype232 = 0;
- $xfer += $input->readMapBegin($_ktype231, $_vtype232, $_size230);
- for ($_i234 = 0; $_i234 < $_size230; ++$_i234)
+ $_size223 = 0;
+ $_ktype224 = 0;
+ $_vtype225 = 0;
+ $xfer += $input->readMapBegin($_ktype224, $_vtype225, $_size223);
+ for ($_i227 = 0; $_i227 < $_size223; ++$_i227)
{
- $key235 = '';
- $val236 = '';
- $xfer += $input->readString($key235);
- $xfer += $input->readString($val236);
- $this->success[$key235] = $val236;
+ $key228 = '';
+ $val229 = '';
+ $xfer += $input->readString($key228);
+ $xfer += $input->readString($val229);
+ $this->success[$key228] = $val229;
}
$xfer += $input->readMapEnd();
} else {
@@ -28319,10 +27951,10 @@ class Airavata_getAllApplicationInterfaceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter237 => $viter238)
+ foreach ($this->success as $kiter230 => $viter231)
{
- $xfer += $output->writeString($kiter237);
- $xfer += $output->writeString($viter238);
+ $xfer += $output->writeString($kiter230);
+ $xfer += $output->writeString($viter231);
}
}
$output->writeMapEnd();
@@ -28513,15 +28145,15 @@ class Airavata_getAllApplicationInterfaces_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size239 = 0;
- $_etype242 = 0;
- $xfer += $input->readListBegin($_etype242, $_size239);
- for ($_i243 = 0; $_i243 < $_size239; ++$_i243)
+ $_size232 = 0;
+ $_etype235 = 0;
+ $xfer += $input->readListBegin($_etype235, $_size232);
+ for ($_i236 = 0; $_i236 < $_size232; ++$_i236)
{
- $elem244 = null;
- $elem244 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
- $xfer += $elem244->read($input);
- $this->success []= $elem244;
+ $elem237 = null;
+ $elem237 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription();
+ $xfer += $elem237->read($input);
+ $this->success []= $elem237;
}
$xfer += $input->readListEnd();
} else {
@@ -28573,9 +28205,9 @@ class Airavata_getAllApplicationInterfaces_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter245)
+ foreach ($this->success as $iter238)
{
- $xfer += $iter245->write($output);
+ $xfer += $iter238->write($output);
}
}
$output->writeListEnd();
@@ -28683,7 +28315,7 @@ class Airavata_getApplicationInputs_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\InputDataObjectType[]
*/
public $success = null;
/**
@@ -28708,7 +28340,7 @@ class Airavata_getApplicationInputs_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
),
),
1 => array(
@@ -28766,15 +28398,15 @@ class Airavata_getApplicationInputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size246 = 0;
- $_etype249 = 0;
- $xfer += $input->readListBegin($_etype249, $_size246);
- for ($_i250 = 0; $_i250 < $_size246; ++$_i250)
+ $_size239 = 0;
+ $_etype242 = 0;
+ $xfer += $input->readListBegin($_etype242, $_size239);
+ for ($_i243 = 0; $_i243 < $_size239; ++$_i243)
{
- $elem251 = null;
- $elem251 = new \Airavata\Model\AppCatalog\AppInterface\InputDataObjectType();
- $xfer += $elem251->read($input);
- $this->success []= $elem251;
+ $elem244 = null;
+ $elem244 = new \Airavata\Model\Application\Io\InputDataObjectType();
+ $xfer += $elem244->read($input);
+ $this->success []= $elem244;
}
$xfer += $input->readListEnd();
} else {
@@ -28826,9 +28458,9 @@ class Airavata_getApplicationInputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter252)
+ foreach ($this->success as $iter245)
{
- $xfer += $iter252->write($output);
+ $xfer += $iter245->write($output);
}
}
$output->writeListEnd();
@@ -28936,7 +28568,7 @@ class Airavata_getApplicationOutputs_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType[]
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType[]
*/
public $success = null;
/**
@@ -28961,7 +28593,7 @@ class Airavata_getApplicationOutputs_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType',
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
1 => array(
@@ -29019,15 +28651,15 @@ class Airavata_getApplicationOutputs_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size253 = 0;
- $_etype256 = 0;
- $xfer += $input->readListBegin($_etype256, $_size253);
- for ($_i257 = 0; $_i257 < $_size253; ++$_i257)
+ $_size246 = 0;
+ $_etype249 = 0;
+ $xfer += $input->readListBegin($_etype249, $_size246);
+ for ($_i250 = 0; $_i250 < $_size246; ++$_i250)
{
- $elem258 = null;
- $elem258 = new \Airavata\Model\AppCatalog\AppInterface\OutputDataObjectType();
- $xfer += $elem258->read($input);
- $this->success []= $elem258;
+ $elem251 = null;
+ $elem251 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem251->read($input);
+ $this->success []= $elem251;
}
$xfer += $input->readListEnd();
} else {
@@ -29079,9 +28711,9 @@ class Airavata_getApplicationOutputs_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter259)
+ foreach ($this->success as $iter252)
{
- $xfer += $iter259->write($output);
+ $xfer += $iter252->write($output);
}
}
$output->writeListEnd();
@@ -29275,17 +28907,17 @@ class Airavata_getAvailableAppInterfaceComputeResources_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size260 = 0;
- $_ktype261 = 0;
- $_vtype262 = 0;
- $xfer += $input->readMapBegin($_ktype261, $_vtype262, $_size260);
- for ($_i264 = 0; $_i264 < $_size260; ++$_i264)
+ $_size253 = 0;
+ $_ktype254 = 0;
+ $_vtype255 = 0;
+ $xfer += $input->readMapBegin($_ktype254, $_vtype255, $_size253);
+ for ($_i257 = 0; $_i257 < $_size253; ++$_i257)
{
- $key265 = '';
- $val266 = '';
- $xfer += $input->readString($key265);
- $xfer += $input->readString($val266);
- $this->success[$key265] = $val266;
+ $key258 = '';
+ $val259 = '';
+ $xfer += $input->readString($key258);
+ $xfer += $input->readString($val259);
+ $this->success[$key258] = $val259;
}
$xfer += $input->readMapEnd();
} else {
@@ -29337,10 +28969,10 @@ class Airavata_getAvailableAppInterfaceComputeResources_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter267 => $viter268)
+ foreach ($this->success as $kiter260 => $viter261)
{
- $xfer += $output->writeString($kiter267);
- $xfer += $output->writeString($viter268);
+ $xfer += $output->writeString($kiter260);
+ $xfer += $output->writeString($viter261);
}
}
$output->writeMapEnd();
@@ -29969,17 +29601,17 @@ class Airavata_getAllComputeResourceNames_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size269 = 0;
- $_ktype270 = 0;
- $_vtype271 = 0;
- $xfer += $input->readMapBegin($_ktype270, $_vtype271, $_size269);
- for ($_i273 = 0; $_i273 < $_size269; ++$_i273)
+ $_size262 = 0;
+ $_ktype263 = 0;
+ $_vtype264 = 0;
+ $xfer += $input->readMapBegin($_ktype263, $_vtype264, $_size262);
+ for ($_i266 = 0; $_i266 < $_size262; ++$_i266)
{
- $key274 = '';
- $val275 = '';
- $xfer += $input->readString($key274);
- $xfer += $input->readString($val275);
- $this->success[$key274] = $val275;
+ $key267 = '';
+ $val268 = '';
+ $xfer += $input->readString($key267);
+ $xfer += $input->readString($val268);
+ $this->success[$key267] = $val268;
}
$xfer += $input->readMapEnd();
} else {
@@ -30031,10 +29663,10 @@ class Airavata_getAllComputeResourceNames_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter276 => $viter277)
+ foreach ($this->success as $kiter269 => $viter270)
{
- $xfer += $output->writeString($kiter276);
- $xfer += $output->writeString($viter277);
+ $xfer += $output->writeString($kiter269);
+ $xfer += $output->writeString($viter270);
}
}
$output->writeMapEnd();
@@ -37163,17 +36795,17 @@ class Airavata_changeJobSubmissionPriorities_args {
case 1:
if ($ftype == TType::MAP) {
$this->jobSubmissionPriorityMap = array();
- $_size278 = 0;
- $_ktype279 = 0;
- $_vtype280 = 0;
- $xfer += $input->readMapBegin($_ktype279, $_vtype280, $_size278);
- for ($_i282 = 0; $_i282 < $_size278; ++$_i282)
+ $_size271 = 0;
+ $_ktype272 = 0;
+ $_vtype273 = 0;
+ $xfer += $input->readMapBegin($_ktype272, $_vtype273, $_size271);
+ for ($_i275 = 0; $_i275 < $_size271; ++$_i275)
{
- $key283 = '';
- $val284 = 0;
- $xfer += $input->readString($key283);
- $xfer += $input->readI32($val284);
- $this->jobSubmissionPriorityMap[$key283] = $val284;
+ $key276 = '';
+ $val277 = 0;
+ $xfer += $input->readString($key276);
+ $xfer += $input->readI32($val277);
+ $this->jobSubmissionPriorityMap[$key276] = $val277;
}
$xfer += $input->readMapEnd();
} else {
@@ -37201,10 +36833,10 @@ class Airavata_changeJobSubmissionPriorities_args {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->jobSubmissionPriorityMap));
{
- foreach ($this->jobSubmissionPriorityMap as $kiter285 => $viter286)
+ foreach ($this->jobSubmissionPriorityMap as $kiter278 => $viter279)
{
- $xfer += $output->writeString($kiter285);
- $xfer += $output->writeI32($viter286);
+ $xfer += $output->writeString($kiter278);
+ $xfer += $output->writeI32($viter279);
}
}
$output->writeMapEnd();
@@ -37422,17 +37054,17 @@ class Airavata_changeDataMovementPriorities_args {
case 1:
if ($ftype == TType::MAP) {
$this->dataMovementPriorityMap = array();
- $_size287 = 0;
- $_ktype288 = 0;
- $_vtype289 = 0;
- $xfer += $input->readMapBegin($_ktype288, $_vtype289, $_size287);
- for ($_i291 = 0; $_i291 < $_size287; ++$_i291)
+ $_size280 = 0;
+ $_ktype281 = 0;
+ $_vtype282 = 0;
+ $xfer += $input->readMapBegin($_ktype281, $_vtype282, $_size280);
+ for ($_i284 = 0; $_i284 < $_size280; ++$_i284)
{
- $key292 = '';
- $val293 = 0;
- $xfer += $input->readString($key292);
- $xfer += $input->readI32($val293);
- $this->dataMovementPriorityMap[$key292] = $val293;
+ $key285 = '';
+ $val286 = 0;
+ $xfer += $input->readString($key285);
+ $xfer += $input->readI32($val286);
+ $this->dataMovementPriorityMap[$key285] = $val286;
}
$xfer += $input->readMapEnd();
} else {
@@ -37460,10 +37092,10 @@ class Airavata_changeDataMovementPriorities_args {
{
$output->writeMapBegin(TType::STRING, TType::I32, count($this->dataMovementPriorityMap));
{
- foreach ($this->dataMovementPriorityMap as $kiter294 => $viter295)
+ foreach ($this->dataMovementPriorityMap as $kiter287 => $viter288)
{
- $xfer += $output->writeString($kiter294);
- $xfer += $output->writeI32($viter295);
+ $xfer += $output->writeString($kiter287);
+ $xfer += $output->writeI32($viter288);
}
}
$output->writeMapEnd();
@@ -40938,15 +40570,15 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size296 = 0;
- $_etype299 = 0;
- $xfer += $input->readListBegin($_etype299, $_size296);
- for ($_i300 = 0; $_i300 < $_size296; ++$_i300)
+ $_size289 = 0;
+ $_etype292 = 0;
+ $xfer += $input->readListBegin($_etype292, $_size289);
+ for ($_i293 = 0; $_i293 < $_size289; ++$_i293)
{
- $elem301 = null;
- $elem301 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
- $xfer += $elem301->read($input);
- $this->success []= $elem301;
+ $elem294 = null;
+ $elem294 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
+ $xfer += $elem294->read($input);
+ $this->success []= $elem294;
}
$xfer += $input->readListEnd();
} else {
@@ -40998,9 +40630,9 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter302)
+ foreach ($this->success as $iter295)
{
- $xfer += $iter302->write($output);
+ $xfer += $iter295->write($output);
}
}
$output->writeListEnd();
@@ -41166,15 +40798,15 @@ class Airavata_getAllGatewayComputeResources_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size303 = 0;
- $_etype306 = 0;
- $xfer += $input->readListBegin($_etype306, $_size303);
- for ($_i307 = 0; $_i307 < $_size303; ++$_i307)
+ $_size296 = 0;
+ $_etype299 = 0;
+ $xfer += $input->readListBegin($_etype299, $_size296);
+ for ($_i300 = 0; $_i300 < $_size296; ++$_i300)
{
- $elem308 = null;
- $elem308 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile();
- $xfer += $elem308->read($input);
- $this->success []= $elem308;
+ $elem301 = null;
+ $elem301 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile();
+ $xfer += $elem301->read($input);
+ $this->success []= $elem301;
}
$xfer += $input->readListEnd();
} else {
@@ -41226,9 +40858,9 @@ class Airavata_getAllGatewayComputeResources_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter309)
+ foreach ($this->success as $iter302)
{
- $xfer += $iter309->write($output);
+ $xfer += $iter302->write($output);
}
}
$output->writeListEnd();
@@ -41942,14 +41574,14 @@ class Airavata_getAllWorkflows_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size310 = 0;
- $_etype313 = 0;
- $xfer += $input->readListBegin($_etype313, $_size310);
- for ($_i314 = 0; $_i314 < $_size310; ++$_i314)
+ $_size303 = 0;
+ $_etype306 = 0;
+ $xfer += $input->readListBegin($_etype306, $_size303);
+ for ($_i307 = 0; $_i307 < $_size303; ++$_i307)
{
- $elem315 = null;
- $xfer += $input->readString($elem315);
- $this->success []= $elem315;
+ $elem308 = null;
+ $xfer += $input->readString($elem308);
+ $this->success []= $elem308;
}
$xfer += $input->readListEnd();
} else {
@@ -42001,9 +41633,9 @@ class Airavata_getAllWorkflows_result {
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter316)
+ foreach ($this->success as $iter309)
{
- $xfer += $output->writeString($iter316);
+ $xfer += $output->writeString($iter309);
}
}
$output->writeListEnd();
[11/14] airavata git commit: Adding taskId to JobModel
Posted by sc...@apache.org.
Adding taskId to JobModel
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ed63a40a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ed63a40a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ed63a40a
Branch: refs/heads/master
Commit: ed63a40af60cd2d918bc23df18c05a6862b97398
Parents: 0dfd5a4
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jun 23 23:15:34 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jun 23 23:15:36 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../main/resources/lib/airavata/Airavata.cpp | 1157 ++++++------------
.../src/main/resources/lib/airavata/Airavata.h | 853 +++++--------
.../lib/airavata/Airavata_server.skeleton.cpp | 61 +-
.../resources/lib/Airavata/API/Airavata.php | 938 +++++---------
.../Model/AppCatalog/AppInterface/Types.php | 649 +---------
.../Airavata/Model/Messaging/Event/Types.php | 230 +---
.../main/resources/lib/Airavata/Model/Types.php | 12 +-
.../lib/Airavata/Model/Workspace/Types.php | 2 +-
.../lib/apache/airavata/api/Airavata-remote | 17 +-
.../lib/apache/airavata/api/Airavata.py | 593 +++------
.../lib/apache/airavata/api/error/ttypes.py | 2 +-
.../resources/lib/apache/airavata/api/ttypes.py | 6 +-
.../model/appcatalog/appinterface/ttypes.py | 458 +------
.../airavata/model/messaging/event/ttypes.py | 188 +--
.../lib/apache/airavata/model/ttypes.py | 3 +
.../apache/airavata/model/workflow/ttypes.py | 10 +-
.../apache/airavata/model/workspace/ttypes.py | 6 +-
.../org/apache/airavata/model/Workflow.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/DataMovementInterface.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/GridFTPDataMovement.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreDataMovement.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 209 ++--
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 141 ++-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 151 ++-
.../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/ProcessSubmitEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../model/messaging/event/TaskSubmitEvent.java | 2 +-
.../messaging/event/TaskTerminateEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../airavata-api/job_model.thrift | 13 +-
86 files changed, 1593 insertions(+), 4236 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ed63a40a/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 3ff9fd0..c0b468d 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-6-18")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-23")
public class Airavata {
public interface Iface {
[12/14] airavata git commit: Adding job data model to the registry
Posted by sc...@apache.org.
Adding job data model to the registry
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ec1ba5a2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ec1ba5a2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ec1ba5a2
Branch: refs/heads/master
Commit: ec1ba5a2bb9e2ef68d17034756bd5a0131b36402
Parents: ed63a40
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jun 24 02:30:50 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jun 24 02:30:50 2015 +0530
----------------------------------------------------------------------
.../core/experiment/catalog/ResourceType.java | 20 +-
.../catalog/impl/ExperimentCatalogImpl.java | 29 ++
.../catalog/impl/ExperimentRegistry.java | 150 +++++++++-
.../core/experiment/catalog/model/Job.java | 163 +++++++++++
.../experiment/catalog/model/JobStatus.java | 127 ++++++++
.../experiment/catalog/model/JobStatusPK.java | 74 +++++
.../resources/AbstractExpCatResource.java | 17 ++
.../catalog/resources/JobResource.java | 293 +++++++++++++++++++
.../catalog/resources/JobStatusResource.java | 143 +++++++++
.../catalog/resources/TaskResource.java | 26 +-
.../experiment/catalog/resources/Utils.java | 40 +++
.../utils/ThriftDataModelConversion.java | 29 ++
.../src/main/resources/META-INF/persistence.xml | 2 +
.../src/main/resources/expcatalog-derby.sql | 22 ++
.../src/main/resources/expcatalog-mysql.sql | 23 ++
.../experiment/catalog/JobResourceTest.java | 106 +++++++
.../src/test/resources/expcatalog-derby.sql | 22 ++
.../registry/cpi/ExpCatChildDataType.java | 4 +-
.../cpi/ExperimentCatalogModelType.java | 4 +-
19 files changed, 1279 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ResourceType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ResourceType.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ResourceType.java
index 0aeaa95..3c5bd5a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ResourceType.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ResourceType.java
@@ -26,19 +26,21 @@ public enum ResourceType {
PROJECT_USER,
GATEWAY_WORKER,
EXPERIMENT,
+ USER_CONFIGURATION_DATA,
EXPERIMENT_SUMMARY,
- TASK,
- TASK_ERROR,
- PROCESS_ERROR,
+ EXPERIMENT_INPUT,
+ EXPERIMENT_OUTPUT,
+ EXPERIMENT_STATUS,
EXPERIMENT_ERROR,
PROCESS,
+ PROCESS_RESOURCE_SCHEDULE,
PROCESS_INPUT,
PROCESS_OUTPUT,
- EXPERIMENT_INPUT,
- EXPERIMENT_OUTPUT,
- PROCESS_RESOURCE_SCHEDULE,
- TASK_STATUS,
+ PROCESS_ERROR,
PROCESS_STATUS,
- EXPERIMENT_STATUS,
- USER_CONFIGURATION_DATA;
+ TASK,
+ TASK_ERROR,
+ TASK_STATUS,
+ JOB,
+ JOB_STATUS
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 95707f3..014140e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -29,9 +29,11 @@ import org.apache.airavata.model.commons.ErrorModel;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.ExperimentSummaryModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
+import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.ExperimentStatus;
+import org.apache.airavata.model.status.JobStatus;
import org.apache.airavata.model.status.ProcessStatus;
import org.apache.airavata.model.status.TaskStatus;
import org.apache.airavata.model.task.TaskModel;
@@ -173,6 +175,10 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
return experimentRegistry.addTaskStatus((TaskStatus) newObjectToAdd, (String) dependentIdentifier);
case TASK_ERROR:
return experimentRegistry.addTaskError((ErrorModel) newObjectToAdd, (String) dependentIdentifier);
+ case JOB:
+ return experimentRegistry.addJob((JobModel) newObjectToAdd, (String) dependentIdentifier);
+ case JOB_STATUS:
+ return experimentRegistry.addJobStatus((JobStatus) newObjectToAdd, (String) dependentIdentifier);
default:
logger.error("Unsupported dependent data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -244,6 +250,12 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
case TASK_ERROR:
experimentRegistry.updateTaskError((ErrorModel) newObjectToUpdate, (String) identifier);
break;
+ case JOB:
+ experimentRegistry.updateJob((JobModel) newObjectToUpdate, (String) identifier);
+ break;
+ case JOB_STATUS:
+ experimentRegistry.updateJobStatus((JobStatus) newObjectToUpdate, (String) identifier);
+ break;
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -336,6 +348,10 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
return experimentRegistry.getTaskStatus((String) identifier);
case TASK_ERROR:
return experimentRegistry.getTaskError((String) identifier);
+ case JOB:
+ return experimentRegistry.getJob((String) identifier, null);
+ case JOB_STATUS:
+ return experimentRegistry.getJobStatus((String) identifier);
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -391,6 +407,12 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
result.add(task);
}
return result;
+ case JOB:
+ List<JobModel> jobList = experimentRegistry.getJobList(fieldName, value);
+ for (JobModel task : jobList) {
+ result.add(task);
+ }
+ return result;
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -561,6 +583,8 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
return experimentRegistry.getProcessIds(fieldName, value);
case TASK:
return experimentRegistry.getTaskIds(fieldName, value);
+ case JOB:
+ return experimentRegistry.getJobIds(fieldName, value);
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -605,6 +629,9 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
case TASK:
experimentRegistry.removeTask((String) identifier);
break;
+ case JOB:
+ experimentRegistry.removeJob((String) identifier);
+ break;
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
@@ -643,6 +670,8 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
return experimentRegistry.isProcessResourceScheduleExist((String) identifier);
case TASK:
return experimentRegistry.isTaskExist((String) identifier);
+ case JOB:
+ return experimentRegistry.isJobExist((String) identifier);
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 76dfc31..75218b7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -29,6 +29,7 @@ import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.ExperimentStatistics;
import org.apache.airavata.model.experiment.ExperimentSummaryModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
+import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.*;
@@ -459,6 +460,51 @@ public class ExperimentRegistry {
return taskId;
}
+ public String addJob(JobModel job, String taskId) throws RegistryException {
+ try {
+ JobResource jobResource = new JobResource();
+ jobResource.setJobId(getJobID(taskId));
+ jobResource.setTaskId(taskId);
+ jobResource.setJobDescription(job.getJobDescription());
+ jobResource.setCreationTime(AiravataUtils.getTime(job.getCreationTime()));
+ jobResource.setComputeResourceConsumed(job.getComputeResourceConsumed());
+ jobResource.setJobName(job.getJobName());
+ jobResource.setWorkingDir(job.getWorkingDir());
+
+ TaskStatus taskStatus = new TaskStatus();
+ taskStatus.setState(TaskState.CREATED);
+ addTaskStatus(taskStatus, job.getJobId());
+ } catch (Exception e) {
+ logger.error(taskId, "Error while adding task...", e);
+ throw new RegistryException(e);
+ }
+ return taskId;
+ }
+
+ public String addJobStatus(JobStatus jobStatus, String jobID) throws RegistryException {
+ try {
+ JobResource jobResource = new JobResource();
+ jobResource.setJobId(jobID);
+ JobStatusResource status = jobResource.getJobStatus();
+ if (status == null) {
+ status = new JobStatusResource();
+ }
+ if (isValidStatusTransition(ProcessState.valueOf(status.getState()), jobStatus.getJobState())) {
+ status.setStatusId(getStatusID(jobID));
+ status.setJobId(jobID);
+ status.setTimeOfStateChange(AiravataUtils.getTime(jobStatus.getTimeOfStateChange()));
+ status.setState(jobStatus.getJobState().toString());
+ status.setReason(jobStatus.getReason());
+ status.save();
+ logger.debug(jobID, "Added job {} status to {}.", jobID, jobStatus.toString());
+ }
+ } catch (Exception e) {
+ logger.error(jobID, "Error while adding job status...", e);
+ throw new RegistryException(e);
+ }
+ return jobID;
+ }
+
//CPI Update Methods
public void updateExperiment(ExperimentModel experiment, String expId) throws RegistryException {
@@ -761,6 +807,33 @@ public class ExperimentRegistry {
return addTaskError(taskError, taskID);
}
+ public String updateJob(JobModel job, String jobId) throws RegistryException {
+ try {
+ TaskResource taskResource = new TaskResource();
+ JobResource jobResource = taskResource.getJob(jobId);
+ jobResource.setJobId(jobId);
+ jobResource.setTaskId(job.getTaskId());
+ jobResource.setJobDescription(job.getJobDescription());
+ jobResource.setCreationTime(AiravataUtils.getTime(job.getCreationTime()));
+ jobResource.setComputeResourceConsumed(job.getComputeResourceConsumed());
+ jobResource.setJobName(job.getJobName());
+ jobResource.setWorkingDir(job.getWorkingDir());
+
+ TaskStatus taskStatus = new TaskStatus();
+ taskStatus.setState(TaskState.CREATED);
+ addTaskStatus(taskStatus, job.getJobId());
+ } catch (Exception e) {
+ logger.error(jobId, "Error while adding job...", e);
+ throw new RegistryException(e);
+ }
+ return jobId;
+ }
+
+ public String updateJobStatus(JobStatus jobStatus, String jobID) throws RegistryException {
+ return addJobStatus(jobStatus, jobID);
+ }
+
+
//TODO
public void updateExperimentField(String expID, String fieldName, Object value) throws RegistryException {
try {
@@ -912,7 +985,7 @@ public class ExperimentRegistry {
if (fieldName == null) {
return ThriftDataModelConversion.getProcesModel(resource);
} else {
- logger.error("Unsupported field name for experiment basic data..");
+ logger.error("Unsupported field name for process basic data..");
}
}catch (Exception e) {
logger.error("Error while getting process data..", e);
@@ -948,10 +1021,10 @@ public class ExperimentRegistry {
if (fieldName == null) {
return ThriftDataModelConversion.getTaskModel(resource);
} else {
- logger.error("Unsupported field name for experiment basic data..");
+ logger.error("Unsupported field name for task basic data..");
}
}catch (Exception e) {
- logger.error("Error while getting process data..", e);
+ logger.error("Error while getting task data..", e);
throw new RegistryException(e);
}
return null;
@@ -965,6 +1038,27 @@ public class ExperimentRegistry {
return null;
}
+ public Object getJob(String jobId, String fieldName) throws RegistryException {
+ try {
+ TaskResource taskResource = new TaskResource();
+ JobResource resource = taskResource.getJob(jobId);
+ if (fieldName == null) {
+ return ThriftDataModelConversion.getJobModel(resource);
+ } else {
+ logger.error("Unsupported field name for job basic data..");
+ }
+ }catch (Exception e) {
+ logger.error("Error while getting job data..", e);
+ throw new RegistryException(e);
+ }
+ return null;
+ }
+
+ public Object getJobStatus(String identifier) {
+ return null;
+ }
+
+
public List<ExperimentModel> getExperimentList(String fieldName, Object value) throws RegistryException {
List<ExperimentModel> experiments = new ArrayList<ExperimentModel>();
try {
@@ -1011,6 +1105,10 @@ public class ExperimentRegistry {
return null;
}
+ public List<JobModel> getJobList(String fieldName, Object value) {
+ return null;
+ }
+
public List<ExperimentModel> getExperimentList(String fieldName, Object value, int limit, int offset,
Object orderByIdentifier, ResultOrderType resultOrderType) throws RegistryException {
List<ExperimentModel> experiments = new ArrayList<ExperimentModel>();
@@ -1193,6 +1291,15 @@ public class ExperimentRegistry {
return taskIds;
}
+ public List<String> getJobIds(String fieldName, Object value) throws RegistryException {
+ List<String> jobIds = new ArrayList<String>();
+ List<JobModel> jobs = getJobList(fieldName, value);
+ for (JobModel job : jobs) {
+ jobIds.add(job.getJobId());
+ }
+ return jobIds;
+ }
+
//Remove CPI methods
public void removeExperiment(String experimentId) throws RegistryException {
@@ -1246,6 +1353,16 @@ public class ExperimentRegistry {
}
}
+ public void removeJob(String jobId) throws RegistryException {
+ try {
+ TaskResource taskResource = new TaskResource();
+ taskResource.remove(ResourceType.JOB, jobId);
+ } catch (Exception e) {
+ logger.error("Error while removing task details..", e);
+ throw new RegistryException(e);
+ }
+ }
+
//isExists CPI methods
public boolean isExperimentExist(String expID) throws RegistryException {
@@ -1298,6 +1415,17 @@ public class ExperimentRegistry {
}
}
+
+ public boolean isJobExist(String jobId) throws RegistryException {
+ try {
+ TaskResource taskResource = new TaskResource();
+ return taskResource.isExists(ResourceType.JOB, jobId);
+ } catch (Exception e) {
+ logger.error("Error while retrieving job.....", e);
+ throw new RegistryException(e);
+ }
+ }
+
public String getExperimentID(String experimentName) {
String exp = experimentName.replaceAll("\\s", "");
return exp + "_" + UUID.randomUUID();
@@ -1313,6 +1441,11 @@ public class ExperimentRegistry {
return taskId + "_" + UUID.randomUUID();
}
+ public String getJobID(String taskId) {
+ String jobId = taskId.replaceAll("\\s", "");
+ return jobId + "_" + UUID.randomUUID();
+ }
+
public String getStatusID(String parentId) {
String status = parentId.replaceAll("\\s", "");
return status + "_" + UUID.randomUUID();
@@ -1389,6 +1522,17 @@ public class ExperimentRegistry {
default:
return false;
}
+ }else if (object1 instanceof JobState && object2 instanceof JobState) {
+ JobState oldState = (JobState) object1;
+ JobState nextState = (JobState) object2;
+ if (nextState == null) {
+ return false;
+ }
+ //TODO
+ switch (oldState) {
+ default:
+ return false;
+ }
}
return false;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java
new file mode 100644
index 0000000..95e1f1d
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java
@@ -0,0 +1,163 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.registry.core.experiment.catalog.model;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.Collection;
+
+@Entity
+public class Job {
+ private final static Logger logger = LoggerFactory.getLogger(Job.class);
+ private String jobId;
+ private String taskId;
+ private String jobDescription;
+ private Timestamp creationTime;
+ private String computeResourceConsumed;
+ private String jobName;
+ private String workingDir;
+ private Task task;
+ private Collection<JobStatus> jobStatuses;
+
+ @Id
+ @Column(name = "JOB_ID")
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Basic
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Basic
+ @Column(name = "JOB_DESCRIPTION")
+ public String getJobDescription() {
+ return jobDescription;
+ }
+
+ public void setJobDescription(String jobDescription) {
+ this.jobDescription = jobDescription;
+ }
+
+ @Basic
+ @Column(name = "CREATION_TIME")
+ public Timestamp getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(Timestamp creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Basic
+ @Column(name = "COMPUTE_RESOURCE_CONSUMED")
+ public String getComputeResourceConsumed() {
+ return computeResourceConsumed;
+ }
+
+ public void setComputeResourceConsumed(String computeResourceConsumed) {
+ this.computeResourceConsumed = computeResourceConsumed;
+ }
+
+ @Basic
+ @Column(name = "JOB_NAME")
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ @Basic
+ @Column(name = "WORKING_DIR")
+ public String getWorkingDir() {
+ return workingDir;
+ }
+
+ public void setWorkingDir(String workingDir) {
+ this.workingDir = workingDir;
+ }
+
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// Job job = (Job) o;
+//
+// if (computeResourceConsumed != null ? !computeResourceConsumed.equals(job.computeResourceConsumed) : job.computeResourceConsumed != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(job.creationTime) : job.creationTime != null) return false;
+// if (jobDescription != null ? !jobDescription.equals(job.jobDescription) : job.jobDescription != null)
+// return false;
+// if (jobId != null ? !jobId.equals(job.jobId) : job.jobId != null) return false;
+// if (jobName != null ? !jobName.equals(job.jobName) : job.jobName != null) return false;
+// if (taskId != null ? !taskId.equals(job.taskId) : job.taskId != null) return false;
+// if (workingDir != null ? !workingDir.equals(job.workingDir) : job.workingDir != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = jobId != null ? jobId.hashCode() : 0;
+// result = 31 * result + (taskId != null ? taskId.hashCode() : 0);
+// result = 31 * result + (jobDescription != null ? jobDescription.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (computeResourceConsumed != null ? computeResourceConsumed.hashCode() : 0);
+// result = 31 * result + (jobName != null ? jobName.hashCode() : 0);
+// result = 31 * result + (workingDir != null ? workingDir.hashCode() : 0);
+// return result;
+// }
+
+ @ManyToOne
+ @JoinColumn(name = "TASK_ID", referencedColumnName = "TASK_ID")
+ public Task getTask() {
+ return task;
+ }
+
+ public void setTask(Task taskByTaskId) {
+ this.task = taskByTaskId;
+ }
+
+ @OneToMany(mappedBy = "job")
+ public Collection<JobStatus> getJobStatuses() {
+ return jobStatuses;
+ }
+
+ public void setJobStatuses(Collection<JobStatus> jobStatusesByJobId) {
+ this.jobStatuses = jobStatusesByJobId;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatus.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatus.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatus.java
new file mode 100644
index 0000000..49735ff
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatus.java
@@ -0,0 +1,127 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.registry.core.experiment.catalog.model;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "JOB_STATUS")
+@IdClass(JobStatusPK.class)
+public class JobStatus {
+ private final static Logger logger = LoggerFactory.getLogger(JobStatus.class);
+ private String statusId;
+ private String jobId;
+ private String state;
+ private Timestamp timeOfStateChange;
+ private String reason;
+ private Job job;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getStatusId() {
+ return statusId;
+ }
+
+ public void setStatusId(String statusId) {
+ this.statusId = statusId;
+ }
+
+ @Id
+ @Column(name = "JOB_ID")
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Basic
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Basic
+ @Column(name = "TIME_OF_STATE_CHANGE")
+ public Timestamp getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(Timestamp timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ @Basic
+ @Lob
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// TaskStatus that = (TaskStatus) o;
+// if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
+// if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
+// if (state != null ? !state.equals(that.state) : that.state != null) return false;
+// if (jobId != null ? !jobId.equals(that.jobId) : that.jobId != null) return false;
+// if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = statusId != null ? statusId.hashCode() : 0;
+// result = 31 * result + (jobId != null ? jobId.hashCode() : 0);
+// result = 31 * result + (state != null ? state.hashCode() : 0);
+// result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
+// result = 31 * result + (reason != null ? reason.hashCode() : 0);
+// return result;
+// }
+
+ @ManyToOne
+ @JoinColumn(name = "JOB_ID", referencedColumnName = "JOB_ID", nullable = false)
+ public Job getJob() {
+ return job;
+ }
+
+ public void setJob(Job jobById) {
+ this.job = jobById;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatusPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatusPK.java
new file mode 100644
index 0000000..672319b
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/JobStatusPK.java
@@ -0,0 +1,74 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.registry.core.experiment.catalog.model;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class JobStatusPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(JobStatusPK.class);
+ private String statusId;
+ private String jobId;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getStatusId() {
+ return statusId;
+ }
+
+ public void setStatusId(String statusId) {
+ this.statusId = statusId;
+ }
+
+ @Id
+ @Column(name = "JOB_ID")
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ JobStatusPK that = (JobStatusPK) o;
+
+ if (getStatusId() != null ? !getStatusId().equals(that.getStatusId()) : that.getStatusId() != null) return false;
+ if (getJobId() != null ? !getJobId().equals(that.getJobId()) : that.getJobId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getStatusId() != null ? getStatusId().hashCode() : 0;
+ result = 31 * result + (getJobId() != null ? getJobId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
index f4b4d37..8608d65 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/AbstractExpCatResource.java
@@ -49,6 +49,8 @@ public abstract class AbstractExpCatResource implements ExperimentCatResource {
public static final String TASK = "Task";
public static final String TASK_ERROR = "TaskError";
public static final String TASK_STATUS = "TaskStatus";
+ public static final String JOB = "Job";
+ public static final String JOB_STATUS = "JobStatus";
// Gateway Table
@@ -215,6 +217,21 @@ public abstract class AbstractExpCatResource implements ExperimentCatResource {
public static final String PROCESS_ID = "processId";
}
+ //Job Table
+ public final class JobConstants {
+ public static final String JOB_ID = "jobId";
+ public static final String TASK_ID = "taskId";
+ }
+
+ // Job Status table
+ public final class JobStatusConstants {
+ public static final String STATUS_ID = "statusId";
+ public static final String JOB_ID = "jobId";
+ public static final String STATE = "state";
+ public static final String TIME_OF_STATE_CHANGE = "timeOfStateChange";
+ public static final String REASON = "reason";
+ }
+
// Task Status table
public final class TaskStatusConstants {
public static final String STATUS_ID = "statusId";
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
new file mode 100644
index 0000000..55bdd98
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java
@@ -0,0 +1,293 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.core.experiment.catalog.resources;
+
+import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
+import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
+import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
+import org.apache.airavata.registry.core.experiment.catalog.model.Job;
+import org.apache.airavata.registry.core.experiment.catalog.model.JobStatus;
+import org.apache.airavata.registry.core.experiment.catalog.utils.QueryGenerator;
+import org.apache.airavata.registry.cpi.RegistryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JobResource extends AbstractExpCatResource {
+ private static final Logger logger = LoggerFactory.getLogger(JobResource.class);
+ private String jobId;
+ private String taskId;
+ private String jobDescription;
+ private Timestamp creationTime;
+ private String computeResourceConsumed;
+ private String jobName;
+ private String workingDir;
+
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getJobDescription() {
+ return jobDescription;
+ }
+
+ public void setJobDescription(String jobDescription) {
+ this.jobDescription = jobDescription;
+ }
+
+ public Timestamp getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(Timestamp creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ public String getComputeResourceConsumed() {
+ return computeResourceConsumed;
+ }
+
+ public void setComputeResourceConsumed(String computeResourceConsumed) {
+ this.computeResourceConsumed = computeResourceConsumed;
+ }
+
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ public String getWorkingDir() {
+ return workingDir;
+ }
+
+ public void setWorkingDir(String workingDir) {
+ this.workingDir = workingDir;
+ }
+
+ public ExperimentCatResource create(ResourceType type) throws RegistryException {
+ switch (type){
+ case JOB_STATUS:
+ JobStatusResource jobStatusResource = new JobStatusResource();
+ jobStatusResource.setJobId(jobId);
+ return jobStatusResource;
+ default:
+ logger.error("Unsupported resource type for job details data resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+ }
+
+
+ public void remove(ResourceType type, Object name) throws RegistryException{
+ EntityManager em = null;
+ try {
+ em = ExpCatResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ Query q;
+ QueryGenerator generator;
+ switch (type) {
+ case JOB_STATUS:
+ generator = new QueryGenerator(JOB_STATUS);
+ generator.setParameter(JobStatusConstants.STATUS_ID, name);
+ q = generator.deleteQuery(em);
+ q.executeUpdate();
+ break;
+ default:
+ logger.error("Unsupported resource type for job details resource.", new IllegalArgumentException());
+ break;
+ }
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+
+ public ExperimentCatResource get(ResourceType type, Object name) throws RegistryException {
+ EntityManager em = null;
+ try {
+ em = ExpCatResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ QueryGenerator generator;
+ Query q;
+ switch (type) {
+ case JOB_STATUS:
+ generator = new QueryGenerator(JOB_STATUS);
+ generator.setParameter(JobStatusConstants.STATUS_ID, name);
+ q = generator.selectQuery(em);
+ JobStatus status = (JobStatus) q.getSingleResult();
+ JobStatusResource statusResource = (JobStatusResource) Utils.getResource(ResourceType.JOB_STATUS, status);
+ em.getTransaction().commit();
+ em.close();
+ return statusResource;
+ default:
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported resource type for Job resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported resource type for Job resource.");
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+
+ public List<ExperimentCatResource> get(ResourceType type) throws RegistryException{
+ List<ExperimentCatResource> resourceList = new ArrayList<ExperimentCatResource>();
+ EntityManager em = null;
+ try {
+ em = ExpCatResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ Query q;
+ QueryGenerator generator;
+ List results;
+ switch (type) {
+ case JOB_STATUS:
+ generator = new QueryGenerator(JOB_STATUS);
+ generator.setParameter(JobStatusConstants.JOB_ID, jobId);
+ q = generator.selectQuery(em);
+ results = q.getResultList();
+ if (results.size() != 0) {
+ for (Object result : results) {
+ JobStatus jobStatus = (JobStatus) result;
+ JobStatusResource jobStatusResource =
+ (JobStatusResource) Utils.getResource(ResourceType.JOB_STATUS, jobStatus);
+ resourceList.add(jobStatusResource);
+ }
+ }
+ break;
+ default:
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported resource type for job resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ return resourceList;
+ }
+
+
+ public void save() throws RegistryException{
+ EntityManager em = null;
+ try {
+ em = ExpCatResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ Job job = em.find(Job.class, jobId);
+ if(job == null){
+ job = new Job();
+ }
+ job.setJobId(jobId);
+ job.setTaskId(taskId);
+ job.setJobDescription(jobDescription);
+ job.setCreationTime(creationTime);
+ job.setComputeResourceConsumed(computeResourceConsumed);
+ job.setJobName(jobName);
+ job.setWorkingDir(workingDir);
+ em.persist(job);
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ public List<JobStatusResource> getJobStatuses() throws RegistryException{
+ List<JobStatusResource> jobStatusResources = new ArrayList();
+ List<ExperimentCatResource> resources = get(ResourceType.JOB_STATUS);
+ for (ExperimentCatResource resource : resources) {
+ JobStatusResource statusResource = (JobStatusResource) resource;
+ jobStatusResources.add(statusResource);
+ }
+ return jobStatusResources;
+ }
+
+ public JobStatusResource getJobStatus() throws RegistryException{
+ List<JobStatusResource> jobStatusResources = getJobStatuses();
+ if(jobStatusResources.size() == 0){
+ return null;
+ }else{
+ JobStatusResource max = jobStatusResources.get(0);
+ for(int i=1; i<jobStatusResources.size();i++){
+ if(jobStatusResources.get(i).getTimeOfStateChange().after(max.getTimeOfStateChange())){
+ max = jobStatusResources.get(i);
+ }
+ }
+ return max;
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
new file mode 100644
index 0000000..5c0e3b2
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobStatusResource.java
@@ -0,0 +1,143 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.core.experiment.catalog.resources;
+
+import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
+import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
+import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
+import org.apache.airavata.registry.core.experiment.catalog.model.JobStatus;
+import org.apache.airavata.registry.core.experiment.catalog.model.JobStatusPK;
+import org.apache.airavata.registry.cpi.RegistryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import java.sql.Timestamp;
+import java.util.List;
+
+public class JobStatusResource extends AbstractExpCatResource {
+ private static final Logger logger = LoggerFactory.getLogger(JobStatusResource.class);
+ private String statusId;
+ private String jobId;
+ private String state;
+ private Timestamp timeOfStateChange;
+ private String reason;
+
+ public String getStatusId() {
+ return statusId;
+ }
+
+ public void setStatusId(String statusId) {
+ this.statusId = statusId;
+ }
+
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public Timestamp getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(Timestamp timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public ExperimentCatResource create(ResourceType type) throws RegistryException {
+ logger.error("Unsupported resource type for task status data resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+
+
+ public void remove(ResourceType type, Object name) throws RegistryException {
+ logger.error("Unsupported resource type for task status data resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+
+
+ public ExperimentCatResource get(ResourceType type, Object name) throws RegistryException{
+ logger.error("Unsupported resource type for task status data resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+
+
+ public List<ExperimentCatResource> get(ResourceType type) throws RegistryException{
+ logger.error("Unsupported resource type for task status data resource.", new UnsupportedOperationException());
+ throw new UnsupportedOperationException();
+ }
+
+
+ public void save() throws RegistryException{
+ EntityManager em = null;
+ try {
+ em = ExpCatResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ JobStatus jobStatus;
+ if(jobId == null || statusId == null){
+ throw new RegistryException("Does not have the job id or status id");
+ }
+ JobStatusPK jobStatusPK = new JobStatusPK();
+ jobStatusPK.setJobId(jobId);
+ jobStatusPK.setStatusId(statusId);
+ jobStatus = em.find(JobStatus.class, jobStatusPK);
+ if(jobStatus == null){
+ jobStatus = new JobStatus();
+ }
+ jobStatus.setJobId(jobId);
+ jobStatus.setState(state);
+ jobStatus.setReason(reason);
+ em.persist(jobStatus);
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RegistryException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java
index e620278..5d90e4f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java
@@ -24,6 +24,7 @@ package org.apache.airavata.registry.core.experiment.catalog.resources;
import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
+import org.apache.airavata.registry.core.experiment.catalog.model.Job;
import org.apache.airavata.registry.core.experiment.catalog.model.Task;
import org.apache.airavata.registry.core.experiment.catalog.model.TaskError;
import org.apache.airavata.registry.core.experiment.catalog.model.TaskStatus;
@@ -114,8 +115,12 @@ public class TaskResource extends AbstractExpCatResource {
TaskErrorResource taskErrorResource = new TaskErrorResource();
taskErrorResource.setTaskId(taskId);
return taskErrorResource;
+ case JOB:
+ JobResource jobResource = new JobResource();
+ jobResource.setTaskId(taskId);
+ return jobResource;
default:
- logger.error("Unsupported resource type for job details data resource.", new UnsupportedOperationException());
+ logger.error("Unsupported resource type for task data resource.", new UnsupportedOperationException());
throw new UnsupportedOperationException();
}
}
@@ -141,6 +146,12 @@ public class TaskResource extends AbstractExpCatResource {
q = generator.deleteQuery(em);
q.executeUpdate();
break;
+ case JOB:
+ generator = new QueryGenerator(JOB);
+ generator.setParameter(JobConstants.JOB_ID, name);
+ q = generator.deleteQuery(em);
+ q.executeUpdate();
+ break;
default:
logger.error("Unsupported resource type for job details resource.", new IllegalArgumentException());
break;
@@ -189,6 +200,15 @@ public class TaskResource extends AbstractExpCatResource {
em.getTransaction().commit();
em.close();
return errorResource;
+ case JOB:
+ generator = new QueryGenerator(JOB);
+ generator.setParameter(JobConstants.JOB_ID, name);
+ q = generator.selectQuery(em);
+ Job job = (Job) q.getSingleResult();
+ JobResource jobResource = (JobResource) Utils.getResource(ResourceType.JOB, job);
+ em.getTransaction().commit();
+ em.close();
+ return jobResource;
default:
em.getTransaction().commit();
em.close();
@@ -351,4 +371,8 @@ public class TaskResource extends AbstractExpCatResource {
return max;
}
}
+
+ public JobResource getJob(String jobId) throws RegistryException {
+ return (JobResource) get(ResourceType.JOB, jobId);
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index 64f80a3..90fb348 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -313,6 +313,20 @@ public class Utils {
logger.error("Object should be a task error data.", new IllegalArgumentException());
throw new IllegalArgumentException("Object should be task error data.");
}
+ case JOB:
+ if (o instanceof Job){
+ return createJobResource((Job) o);
+ }else {
+ logger.error("Object should be a Job data.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a Job data.");
+ }
+ case JOB_STATUS:
+ if (o instanceof JobStatus){
+ return createJobStatusResource((JobStatus) o);
+ }else {
+ logger.error("Object should be a JobStatus data.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a JobStatus data.");
+ }
default:
logger.error("Illegal data type..", new IllegalArgumentException());
throw new IllegalArgumentException("Illegal data type..");
@@ -622,4 +636,30 @@ public class Utils {
}
return resourceScheduleResource;
}
+
+ private static ExperimentCatResource createJobResource (Job o){
+ JobResource jobResource = new JobResource();
+ if (o != null){
+ jobResource.setJobId(o.getJobId());
+ jobResource.setTaskId(o.getTaskId());
+ jobResource.setCreationTime(o.getCreationTime());
+ jobResource.setJobDescription(o.getJobDescription());
+ jobResource.setComputeResourceConsumed(o.getComputeResourceConsumed());
+ jobResource.setJobName(o.getJobName());
+ jobResource.setWorkingDir(o.getWorkingDir());
+ }
+ return jobResource;
+ }
+
+ private static ExperimentCatResource createJobStatusResource (JobStatus o){
+ JobStatusResource jobStatusResource = new JobStatusResource();
+ if (o != null){
+ jobStatusResource.setJobId(o.getJobId());
+ jobStatusResource.setState(o.getState());
+ jobStatusResource.setTimeOfStateChange(o.getTimeOfStateChange());
+ jobStatusResource.setReason(o.getReason());
+ }
+
+ return jobStatusResource;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 25a2ce6..ba64adf 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -28,6 +28,7 @@ import org.apache.airavata.model.commons.ErrorModel;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.ExperimentSummaryModel;
import org.apache.airavata.model.experiment.UserConfigurationDataModel;
+import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.*;
@@ -311,6 +312,20 @@ public class ThriftDataModelConversion {
return null;
}
+ public static JobStatus getJobStatus (JobStatusResource status){
+ if (status != null){
+ JobStatus jobStatus = new JobStatus();
+ if (status.getState() == null || status.getState().equals("")){
+ status.setState("UNKNOWN");
+ }
+ jobStatus.setJobState(JobState.valueOf(status.getState()));
+ jobStatus.setTimeOfStateChange(status.getTimeOfStateChange().getTime());
+ jobStatus.setReason(status.getReason());
+ return jobStatus;
+ }
+ return null;
+ }
+
public static ProcessModel getProcesModel (ProcessResource processResource) throws RegistryException {
if (processResource != null){
ProcessModel processModel = new ProcessModel();
@@ -363,6 +378,20 @@ public class ThriftDataModelConversion {
return model;
}
+ public static JobModel getJobModel (JobResource jobResource) throws RegistryException {
+ JobModel model = new JobModel();
+ model.setJobId(jobResource.getJobId());
+ model.setTaskId(jobResource.getTaskId());
+ model.setJobDescription(jobResource.getJobDescription());
+ model.setCreationTime(jobResource.getCreationTime().getTime());
+ model.setComputeResourceConsumed(jobResource.getComputeResourceConsumed());
+ model.setJobName(jobResource.getJobName());
+ model.setWorkingDir(jobResource.getWorkingDir());
+ model.setJobStatus(getJobStatus(jobResource.getJobStatus()));
+
+ return model;
+ }
+
public static ErrorModel getErrorModel (Object object){
if (object != null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
index 9e2ddfe..e9cc636 100644
--- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
@@ -87,6 +87,8 @@
<class>org.apache.airavata.registry.core.experiment.catalog.model.TaskStatus</class>
<class>org.apache.airavata.registry.core.experiment.catalog.model.Users</class>
<class>org.apache.airavata.registry.core.experiment.catalog.model.UserConfigurationData</class>
+ <class>org.apache.airavata.registry.core.experiment.catalog.model.Job</class>
+ <class>org.apache.airavata.registry.core.experiment.catalog.model.JobStatus</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index aeab3e5..63f40ef 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -292,6 +292,28 @@ CREATE TABLE TASK_ERROR (
FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
);
+CREATE TABLE JOB (
+ JOB_ID varchar(255),
+ TASK_ID varchar(255),
+ JOB_DESCRIPTION varchar(255),
+ CREATION_TIME timestamp DEFAULT '0000-00-00 00:00:00',
+ COMPUTE_RESOURCE_CONSUMED varchar(255),
+ JOB_NAME varchar(255),
+ WORKING_DIR varchar(255),
+ PRIMARY KEY (JOB_ID),
+ FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JOB_STATUS (
+ STATUS_ID varchar(255),
+ JOB_ID varchar(255),
+ STATE varchar(255),
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
+ REASON CLOB,
+ PRIMARY KEY (STATUS_ID, JOB_ID),
+ FOREIGN KEY (JOB_ID) REFERENCES JOB(JOB_ID) ON DELETE CASCADE
+);
+
CREATE TABLE CONFIGURATION
(
CONFIG_KEY VARCHAR(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index 8a9ebe0..56a3d3a 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -294,6 +294,29 @@ CREATE TABLE TASK_ERROR (
FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
);
+CREATE TABLE JOB (
+ JOB_ID varchar(255),
+ TASK_ID varchar(255),
+ JOB_DESCRIPTION varchar(255),
+ CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ COMPUTE_RESOURCE_CONSUMED varchar(255),
+ JOB_NAME varchar(255),
+ WORKING_DIR varchar(255),
+ PRIMARY KEY (JOB_ID),
+ FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JOB_STATUS (
+ STATUS_ID varchar(255),
+ JOB_ID varchar(255),
+ STATE varchar(255),
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+ REASON LONGTEXT,
+ PRIMARY KEY (STATUS_ID, JOB_ID),
+ FOREIGN KEY (JOB_ID) REFERENCES JOB(JOB_ID) ON DELETE CASCADE
+);
+
+
CREATE TABLE CONFIGURATION
(
CONFIG_KEY VARCHAR(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/JobResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/JobResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/JobResourceTest.java
new file mode 100644
index 0000000..7ee72cb
--- /dev/null
+++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/JobResourceTest.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.airavata.experiment.catalog;
+
+import org.apache.airavata.model.task.TaskTypes;
+import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
+import org.apache.airavata.registry.core.experiment.catalog.resources.ExperimentResource;
+import org.apache.airavata.registry.core.experiment.catalog.resources.JobResource;
+import org.apache.airavata.registry.core.experiment.catalog.resources.ProcessResource;
+import org.apache.airavata.registry.core.experiment.catalog.resources.TaskResource;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+public class JobResourceTest extends AbstractResourceTest{
+
+ private ExperimentResource experimentResource;
+ private ProcessResource processResource;
+ private TaskResource taskResource;
+ private JobResource jobResource;
+ private String experimentID = "testExpID";
+ private String processId = "processID";
+ private String taskId = "taskID";
+ private String jobId = "jobID";
+
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ Timestamp creationTime = new Timestamp(new Date().getTime());
+
+ experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT);
+ experimentResource.setExperimentId(experimentID);
+ experimentResource.setExperimentName(experimentID);
+ experimentResource.setUserName(getWorkerResource().getUser());
+ experimentResource.setProjectId(getProjectResource().getId());
+ experimentResource.setCreationTime(creationTime);
+ experimentResource.save();
+
+ processResource = (ProcessResource)experimentResource.create(ResourceType.PROCESS);
+ processResource.setProcessId(processId);
+ processResource.setExperimentId(experimentID);
+ processResource.setCreationTime(creationTime);
+ processResource.save();
+
+ taskResource = (TaskResource)processResource.create(ResourceType.TASK);
+ taskResource.setTaskId(taskId);
+ taskResource.setParentProcessId(processId);
+ taskResource.setTaskType(TaskTypes.DATA_STAGING.toString());
+ taskResource.setTaskDetail("task detail");
+ taskResource.setTaskInternalStore((byte)2);
+ taskResource.save();
+
+ jobResource = (JobResource)taskResource.create(ResourceType.JOB);
+ jobResource.setJobId(jobId);
+ taskResource.setTaskId(taskId);
+ jobResource.setJobDescription("Job Description");
+ jobResource.setComputeResourceConsumed("computer-resource-host");
+ jobResource.setJobName("JobName");
+ jobResource.setWorkingDir("WorkingDir");
+ jobResource.save();
+ }
+
+
+ @Test
+ public void testCreate() throws Exception {
+ assertNotNull("job data resource has being created ", jobResource);
+ }
+
+ @Test
+ public void testSave() throws Exception {
+ assertTrue("job save successfully", taskResource.isExists(ResourceType.JOB, jobId));
+ }
+
+ @Test
+ public void testGet() throws Exception {
+ assertNotNull("job data retrieved successfully", taskResource.get(ResourceType.JOB, jobId));
+ }
+
+ @Test
+ public void testRemove() throws Exception {
+ taskResource.remove(ResourceType.JOB, jobId);
+ assertFalse("job data removed successfully", taskResource.isExists(ResourceType.JOB, jobId));
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
index aeab3e5..63f40ef 100644
--- a/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
@@ -292,6 +292,28 @@ CREATE TABLE TASK_ERROR (
FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
);
+CREATE TABLE JOB (
+ JOB_ID varchar(255),
+ TASK_ID varchar(255),
+ JOB_DESCRIPTION varchar(255),
+ CREATION_TIME timestamp DEFAULT '0000-00-00 00:00:00',
+ COMPUTE_RESOURCE_CONSUMED varchar(255),
+ JOB_NAME varchar(255),
+ WORKING_DIR varchar(255),
+ PRIMARY KEY (JOB_ID),
+ FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JOB_STATUS (
+ STATUS_ID varchar(255),
+ JOB_ID varchar(255),
+ STATE varchar(255),
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
+ REASON CLOB,
+ PRIMARY KEY (STATUS_ID, JOB_ID),
+ FOREIGN KEY (JOB_ID) REFERENCES JOB(JOB_ID) ON DELETE CASCADE
+);
+
CREATE TABLE CONFIGURATION
(
CONFIG_KEY VARCHAR(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
index 845e308..6c1a310 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExpCatChildDataType.java
@@ -33,5 +33,7 @@ public enum ExpCatChildDataType {
PROCESS_RESOURCE_SCHEDULE,
TASK,
TASK_STATUS,
- TASK_ERROR
+ TASK_ERROR,
+ JOB,
+ JOB_STATUS
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ec1ba5a2/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
index 18f60d1..44cb2ed 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ExperimentCatalogModelType.java
@@ -40,5 +40,7 @@ public enum ExperimentCatalogModelType {
PROCESS_RESOURCE_SCHEDULE,
TASK,
TASK_STATUS,
- TASK_ERROR
+ TASK_ERROR,
+ JOB,
+ JOB_STATUS
}