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 2016/08/31 19:14:09 UTC
[01/10] airavata git commit: updating the registry refactoring code
Repository: airavata
Updated Branches:
refs/heads/develop 2b3dec807 -> 570832d1c
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java
index 3561d5a..342b73c 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/RepositoryTest.java
@@ -20,13 +20,23 @@
*/
package org.apache.airavata.registry.core.repositories;
+import org.apache.airavata.model.experiment.ExperimentModel;
+import org.apache.airavata.model.experiment.UserConfigurationDataModel;
+import org.apache.airavata.model.user.UserProfile;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.model.workspace.GatewayApprovalStatus;
import org.apache.airavata.model.workspace.Notification;
+import org.apache.airavata.model.workspace.Project;
+import org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity;
import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity;
import org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity;
+import org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity;
+import org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity;
+import org.apache.airavata.registry.core.repositories.expcatalog.ExperimentRepository;
import org.apache.airavata.registry.core.repositories.workspacecatalog.GatewayRepository;
import org.apache.airavata.registry.core.repositories.workspacecatalog.NotificationRepository;
+import org.apache.airavata.registry.core.repositories.workspacecatalog.ProjectRepository;
+import org.apache.airavata.registry.core.repositories.workspacecatalog.UserProfileRepository;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -56,5 +66,35 @@ public class RepositoryTest {
notificationRepository.create(notification);
notificationRepository.get(notification.getNotificationId());
+
+ UserProfile userProfile = new UserProfile();
+ userProfile.setAiravataInternalUserId(UUID.randomUUID().toString());
+ userProfile.setGatewayId(gateway.getGatewayId());
+ UserProfileRepository userProfileRepository = new UserProfileRepository(UserProfile.class, UserProfileEntity.class);
+ userProfileRepository.create(userProfile);
+
+
+ Project project = new Project();
+ project.setProjectID(UUID.randomUUID().toString());
+ project.setOwner(userProfile.getAiravataInternalUserId());
+ project.setGatewayId(gateway.getGatewayId());
+ project.setName("Project Name");
+
+ ProjectRepository projectRepository = new ProjectRepository(Project.class, ProjectEntity.class);
+ projectRepository.create(project);
+
+ ExperimentModel experiment = new ExperimentModel();
+ experiment.setExperimentId(UUID.randomUUID().toString());
+ experiment.setUserName(userProfile.getAiravataInternalUserId());
+ experiment.setProjectId(project.getProjectID());
+ experiment.setGatewayId(gateway.getGatewayId());
+ experiment.setExperimentName("Dummy Experiment");
+
+ UserConfigurationDataModel userConfigurationData = new UserConfigurationDataModel();
+ userConfigurationData.setExperimentDataDir("some/path");
+ experiment.setUserConfigurationData(userConfigurationData);
+
+ ExperimentRepository experimentRepository = new ExperimentRepository(ExperimentModel.class, ExperimentEntity.class);
+ experimentRepository.create(experiment);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
index e0c939d..e6b17ba 100644
--- a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift
@@ -164,21 +164,22 @@ struct UserProfile {
1: required string userModelVersion = USER_PROFILE_VERSION,
2: required string airavataInternalUserId = airavata_commons.DEFAULT_ID,
3: required string userId,
- 4: required list<string> emails,
- 5: optional string userName,
- 6: optional string orcidId,
- 7: optional list<string> phones,
- 8: optional string country,
- 9: optional list<string> nationality,
- 10: optional string homeOrganization,
- 11: optional string orginationAffiliation,
- 12: required string creationTime,
- 13: required string lastAccessTime,
- 14: required string validUntil,
- 15: required Status State,
- 16: optional string comments,
- 17: optional list<string> labeledURI,
- 18: optional string gpgKey,
- 19: optional string timeZone,
- 20: optional NSFDemographics nsfDemographics
+ 4: required string gatewayId,
+ 5: required list<string> emails,
+ 6: optional string userName,
+ 7: optional string orcidId,
+ 8: optional list<string> phones,
+ 9: optional string country,
+ 10: optional list<string> nationality,
+ 11: optional string homeOrganization,
+ 12: optional string orginationAffiliation,
+ 13: required string creationTime,
+ 14: required string lastAccessTime,
+ 15: required string validUntil,
+ 16: required Status State,
+ 17: optional string comments,
+ 18: optional list<string> labeledURI,
+ 19: optional string gpgKey,
+ 20: optional string timeZone,
+ 21: optional NSFDemographics nsfDemographics
}
\ No newline at end of file
[09/10] airavata git commit: making errors and statuses list in
Process and Task models
Posted by sc...@apache.org.
making errors and statuses list in Process and Task models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b46fd511
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b46fd511
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b46fd511
Branch: refs/heads/develop
Commit: b46fd511789f4f58a6e2a89f0e608240c844baad
Parents: eee49d3
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 29 16:06:08 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 29 16:06:08 2016 -0400
----------------------------------------------------------------------
.../resources/lib/airavata/job_model_types.cpp | 86 ++++--
.../resources/lib/airavata/job_model_types.h | 4 +-
.../resources/lib/airavata/task_model_types.cpp | 242 ++++++++-------
.../resources/lib/airavata/task_model_types.h | 8 +-
.../resources/lib/Airavata/Model/Task/Types.php | 102 +++++--
.../resources/lib/Airavata/Model/job/Types.php | 41 ++-
.../lib/apache/airavata/model/job/ttypes.py | 20 +-
.../lib/apache/airavata/model/task/ttypes.py | 54 ++--
.../org/apache/airavata/model/job/JobModel.java | 142 +++++----
.../airavata/model/process/ProcessModel.java | 177 +++++------
.../apache/airavata/model/task/TaskModel.java | 302 ++++++++++++-------
.../apache/airavata/gfac/core/GFacUtils.java | 9 +-
.../gfac/core/context/ProcessContext.java | 10 +-
.../airavata/gfac/core/context/TaskContext.java | 17 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 25 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 5 +-
.../gfac/impl/task/BESJobSubmissionTask.java | 10 +-
.../airavata/gfac/impl/task/DataStageTask.java | 8 +-
.../impl/task/DefaultJobSubmissionTask.java | 26 +-
.../gfac/impl/task/EnvironmentSetupTask.java | 3 +-
.../gfac/impl/task/ForkJobSubmissionTask.java | 13 +-
.../gfac/impl/task/SCPDataStageTask.java | 16 +-
.../gfac/impl/task/utils/StreamData.java | 8 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 4 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 12 +-
.../core/entities/expcatalog/JobEntity.java | 10 +-
.../core/entities/expcatalog/ProcessEntity.java | 20 +-
.../core/entities/expcatalog/TaskEntity.java | 20 +-
.../expcatalog/ExperimentRepository.java | 8 +-
.../catalog/impl/ExperimentRegistry.java | 32 +-
.../utils/ThriftDataModelConversion.java | 16 +-
.../service/handler/RegistryServerHandler.java | 2 +-
.../experiment-catalog-models/job_model.thrift | 2 +-
.../process_model.thrift | 4 +-
.../experiment-catalog-models/task_model.thrift | 4 +-
35 files changed, 864 insertions(+), 598 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.cpp
index 50bdd6d..b411913 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.cpp
@@ -56,7 +56,7 @@ void JobModel::__set_creationTime(const int64_t val) {
__isset.creationTime = true;
}
-void JobModel::__set_jobStatus(const ::apache::airavata::model::status::JobStatus& val) {
+void JobModel::__set_jobStatus(const std::vector< ::apache::airavata::model::status::JobStatus> & val) {
this->jobStatus = val;
__isset.jobStatus = true;
}
@@ -157,8 +157,20 @@ uint32_t JobModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 6:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->jobStatus.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->jobStatus.clear();
+ uint32_t _size0;
+ ::apache::thrift::protocol::TType _etype3;
+ xfer += iprot->readListBegin(_etype3, _size0);
+ this->jobStatus.resize(_size0);
+ uint32_t _i4;
+ for (_i4 = 0; _i4 < _size0; ++_i4)
+ {
+ xfer += this->jobStatus[_i4].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.jobStatus = true;
} else {
xfer += iprot->skip(ftype);
@@ -259,8 +271,16 @@ uint32_t JobModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeFieldEnd();
}
if (this->__isset.jobStatus) {
- xfer += oprot->writeFieldBegin("jobStatus", ::apache::thrift::protocol::T_STRUCT, 6);
- xfer += this->jobStatus.write(oprot);
+ xfer += oprot->writeFieldBegin("jobStatus", ::apache::thrift::protocol::T_LIST, 6);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobStatus.size()));
+ std::vector< ::apache::airavata::model::status::JobStatus> ::const_iterator _iter5;
+ for (_iter5 = this->jobStatus.begin(); _iter5 != this->jobStatus.end(); ++_iter5)
+ {
+ xfer += (*_iter5).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
if (this->__isset.computeResourceConsumed) {
@@ -315,35 +335,35 @@ void swap(JobModel &a, JobModel &b) {
swap(a.__isset, b.__isset);
}
-JobModel::JobModel(const JobModel& other0) {
- jobId = other0.jobId;
- taskId = other0.taskId;
- processId = other0.processId;
- jobDescription = other0.jobDescription;
- creationTime = other0.creationTime;
- jobStatus = other0.jobStatus;
- computeResourceConsumed = other0.computeResourceConsumed;
- jobName = other0.jobName;
- workingDir = other0.workingDir;
- stdOut = other0.stdOut;
- stdErr = other0.stdErr;
- exitCode = other0.exitCode;
- __isset = other0.__isset;
+JobModel::JobModel(const JobModel& other6) {
+ jobId = other6.jobId;
+ taskId = other6.taskId;
+ processId = other6.processId;
+ jobDescription = other6.jobDescription;
+ creationTime = other6.creationTime;
+ jobStatus = other6.jobStatus;
+ computeResourceConsumed = other6.computeResourceConsumed;
+ jobName = other6.jobName;
+ workingDir = other6.workingDir;
+ stdOut = other6.stdOut;
+ stdErr = other6.stdErr;
+ exitCode = other6.exitCode;
+ __isset = other6.__isset;
}
-JobModel& JobModel::operator=(const JobModel& other1) {
- jobId = other1.jobId;
- taskId = other1.taskId;
- processId = other1.processId;
- jobDescription = other1.jobDescription;
- creationTime = other1.creationTime;
- jobStatus = other1.jobStatus;
- computeResourceConsumed = other1.computeResourceConsumed;
- jobName = other1.jobName;
- workingDir = other1.workingDir;
- stdOut = other1.stdOut;
- stdErr = other1.stdErr;
- exitCode = other1.exitCode;
- __isset = other1.__isset;
+JobModel& JobModel::operator=(const JobModel& other7) {
+ jobId = other7.jobId;
+ taskId = other7.taskId;
+ processId = other7.processId;
+ jobDescription = other7.jobDescription;
+ creationTime = other7.creationTime;
+ jobStatus = other7.jobStatus;
+ computeResourceConsumed = other7.computeResourceConsumed;
+ jobName = other7.jobName;
+ workingDir = other7.workingDir;
+ stdOut = other7.stdOut;
+ stdErr = other7.stdErr;
+ exitCode = other7.exitCode;
+ __isset = other7.__isset;
return *this;
}
void JobModel::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.h
index 6b98e32..00ba9fe 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/job_model_types.h
@@ -65,7 +65,7 @@ class JobModel {
std::string processId;
std::string jobDescription;
int64_t creationTime;
- ::apache::airavata::model::status::JobStatus jobStatus;
+ std::vector< ::apache::airavata::model::status::JobStatus> jobStatus;
std::string computeResourceConsumed;
std::string jobName;
std::string workingDir;
@@ -85,7 +85,7 @@ class JobModel {
void __set_creationTime(const int64_t val);
- void __set_jobStatus(const ::apache::airavata::model::status::JobStatus& val);
+ void __set_jobStatus(const std::vector< ::apache::airavata::model::status::JobStatus> & val);
void __set_computeResourceConsumed(const std::string& val);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
index f208387..e73eca8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.cpp
@@ -85,7 +85,7 @@ void TaskModel::__set_lastUpdateTime(const int64_t val) {
this->lastUpdateTime = val;
}
-void TaskModel::__set_taskStatus(const ::apache::airavata::model::status::TaskStatus& val) {
+void TaskModel::__set_taskStatus(const std::vector< ::apache::airavata::model::status::TaskStatus> & val) {
this->taskStatus = val;
}
@@ -99,7 +99,7 @@ void TaskModel::__set_subTaskModel(const std::string& val) {
__isset.subTaskModel = true;
}
-void TaskModel::__set_taskError(const ::apache::airavata::model::commons::ErrorModel& val) {
+void TaskModel::__set_taskError(const std::vector< ::apache::airavata::model::commons::ErrorModel> & val) {
this->taskError = val;
__isset.taskError = true;
}
@@ -179,8 +179,20 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 6:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->taskStatus.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->taskStatus.clear();
+ uint32_t _size1;
+ ::apache::thrift::protocol::TType _etype4;
+ xfer += iprot->readListBegin(_etype4, _size1);
+ this->taskStatus.resize(_size1);
+ uint32_t _i5;
+ for (_i5 = 0; _i5 < _size1; ++_i5)
+ {
+ xfer += this->taskStatus[_i5].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
isset_taskStatus = true;
} else {
xfer += iprot->skip(ftype);
@@ -203,8 +215,20 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 9:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->taskError.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->taskError.clear();
+ uint32_t _size6;
+ ::apache::thrift::protocol::TType _etype9;
+ xfer += iprot->readListBegin(_etype9, _size6);
+ this->taskError.resize(_size6);
+ uint32_t _i10;
+ for (_i10 = 0; _i10 < _size6; ++_i10)
+ {
+ xfer += this->taskError[_i10].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.taskError = true;
} else {
xfer += iprot->skip(ftype);
@@ -214,14 +238,14 @@ uint32_t TaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->jobs.clear();
- uint32_t _size1;
- ::apache::thrift::protocol::TType _etype4;
- xfer += iprot->readListBegin(_etype4, _size1);
- this->jobs.resize(_size1);
- uint32_t _i5;
- for (_i5 = 0; _i5 < _size1; ++_i5)
+ uint32_t _size11;
+ ::apache::thrift::protocol::TType _etype14;
+ xfer += iprot->readListBegin(_etype14, _size11);
+ this->jobs.resize(_size11);
+ uint32_t _i15;
+ for (_i15 = 0; _i15 < _size11; ++_i15)
{
- xfer += this->jobs[_i5].read(iprot);
+ xfer += this->jobs[_i15].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -279,8 +303,16 @@ uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeI64(this->lastUpdateTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("taskStatus", ::apache::thrift::protocol::T_STRUCT, 6);
- xfer += this->taskStatus.write(oprot);
+ xfer += oprot->writeFieldBegin("taskStatus", ::apache::thrift::protocol::T_LIST, 6);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->taskStatus.size()));
+ std::vector< ::apache::airavata::model::status::TaskStatus> ::const_iterator _iter16;
+ for (_iter16 = this->taskStatus.begin(); _iter16 != this->taskStatus.end(); ++_iter16)
+ {
+ xfer += (*_iter16).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
if (this->__isset.taskDetail) {
@@ -294,18 +326,26 @@ uint32_t TaskModel::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeFieldEnd();
}
if (this->__isset.taskError) {
- xfer += oprot->writeFieldBegin("taskError", ::apache::thrift::protocol::T_STRUCT, 9);
- xfer += this->taskError.write(oprot);
+ xfer += oprot->writeFieldBegin("taskError", ::apache::thrift::protocol::T_LIST, 9);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->taskError.size()));
+ std::vector< ::apache::airavata::model::commons::ErrorModel> ::const_iterator _iter17;
+ for (_iter17 = this->taskError.begin(); _iter17 != this->taskError.end(); ++_iter17)
+ {
+ xfer += (*_iter17).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
if (this->__isset.jobs) {
xfer += oprot->writeFieldBegin("jobs", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobs.size()));
- std::vector< ::apache::airavata::model::job::JobModel> ::const_iterator _iter6;
- for (_iter6 = this->jobs.begin(); _iter6 != this->jobs.end(); ++_iter6)
+ std::vector< ::apache::airavata::model::job::JobModel> ::const_iterator _iter18;
+ for (_iter18 = this->jobs.begin(); _iter18 != this->jobs.end(); ++_iter18)
{
- xfer += (*_iter6).write(oprot);
+ xfer += (*_iter18).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -331,31 +371,31 @@ void swap(TaskModel &a, TaskModel &b) {
swap(a.__isset, b.__isset);
}
-TaskModel::TaskModel(const TaskModel& other7) {
- taskId = other7.taskId;
- taskType = other7.taskType;
- parentProcessId = other7.parentProcessId;
- creationTime = other7.creationTime;
- lastUpdateTime = other7.lastUpdateTime;
- taskStatus = other7.taskStatus;
- taskDetail = other7.taskDetail;
- subTaskModel = other7.subTaskModel;
- taskError = other7.taskError;
- jobs = other7.jobs;
- __isset = other7.__isset;
-}
-TaskModel& TaskModel::operator=(const TaskModel& other8) {
- taskId = other8.taskId;
- taskType = other8.taskType;
- parentProcessId = other8.parentProcessId;
- creationTime = other8.creationTime;
- lastUpdateTime = other8.lastUpdateTime;
- taskStatus = other8.taskStatus;
- taskDetail = other8.taskDetail;
- subTaskModel = other8.subTaskModel;
- taskError = other8.taskError;
- jobs = other8.jobs;
- __isset = other8.__isset;
+TaskModel::TaskModel(const TaskModel& other19) {
+ taskId = other19.taskId;
+ taskType = other19.taskType;
+ parentProcessId = other19.parentProcessId;
+ creationTime = other19.creationTime;
+ lastUpdateTime = other19.lastUpdateTime;
+ taskStatus = other19.taskStatus;
+ taskDetail = other19.taskDetail;
+ subTaskModel = other19.subTaskModel;
+ taskError = other19.taskError;
+ jobs = other19.jobs;
+ __isset = other19.__isset;
+}
+TaskModel& TaskModel::operator=(const TaskModel& other20) {
+ taskId = other20.taskId;
+ taskType = other20.taskType;
+ parentProcessId = other20.parentProcessId;
+ creationTime = other20.creationTime;
+ lastUpdateTime = other20.lastUpdateTime;
+ taskStatus = other20.taskStatus;
+ taskDetail = other20.taskDetail;
+ subTaskModel = other20.subTaskModel;
+ taskError = other20.taskError;
+ jobs = other20.jobs;
+ __isset = other20.__isset;
return *this;
}
void TaskModel::printTo(std::ostream& out) const {
@@ -458,9 +498,9 @@ uint32_t DataStagingTaskModel::read(::apache::thrift::protocol::TProtocol* iprot
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast9;
- xfer += iprot->readI32(ecast9);
- this->type = (DataStageType::type)ecast9;
+ int32_t ecast21;
+ xfer += iprot->readI32(ecast21);
+ this->type = (DataStageType::type)ecast21;
isset_type = true;
} else {
xfer += iprot->skip(ftype);
@@ -584,27 +624,27 @@ void swap(DataStagingTaskModel &a, DataStagingTaskModel &b) {
swap(a.__isset, b.__isset);
}
-DataStagingTaskModel::DataStagingTaskModel(const DataStagingTaskModel& other10) {
- source = other10.source;
- destination = other10.destination;
- type = other10.type;
- transferStartTime = other10.transferStartTime;
- transferEndTime = other10.transferEndTime;
- transferRate = other10.transferRate;
- processInput = other10.processInput;
- processOutput = other10.processOutput;
- __isset = other10.__isset;
-}
-DataStagingTaskModel& DataStagingTaskModel::operator=(const DataStagingTaskModel& other11) {
- source = other11.source;
- destination = other11.destination;
- type = other11.type;
- transferStartTime = other11.transferStartTime;
- transferEndTime = other11.transferEndTime;
- transferRate = other11.transferRate;
- processInput = other11.processInput;
- processOutput = other11.processOutput;
- __isset = other11.__isset;
+DataStagingTaskModel::DataStagingTaskModel(const DataStagingTaskModel& other22) {
+ source = other22.source;
+ destination = other22.destination;
+ type = other22.type;
+ transferStartTime = other22.transferStartTime;
+ transferEndTime = other22.transferEndTime;
+ transferRate = other22.transferRate;
+ processInput = other22.processInput;
+ processOutput = other22.processOutput;
+ __isset = other22.__isset;
+}
+DataStagingTaskModel& DataStagingTaskModel::operator=(const DataStagingTaskModel& other23) {
+ source = other23.source;
+ destination = other23.destination;
+ type = other23.type;
+ transferStartTime = other23.transferStartTime;
+ transferEndTime = other23.transferEndTime;
+ transferRate = other23.transferRate;
+ processInput = other23.processInput;
+ processOutput = other23.processOutput;
+ __isset = other23.__isset;
return *this;
}
void DataStagingTaskModel::printTo(std::ostream& out) const {
@@ -667,9 +707,9 @@ uint32_t EnvironmentSetupTaskModel::read(::apache::thrift::protocol::TProtocol*
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast12;
- xfer += iprot->readI32(ecast12);
- this->protocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast12;
+ int32_t ecast24;
+ xfer += iprot->readI32(ecast24);
+ this->protocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast24;
isset_protocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -715,13 +755,13 @@ void swap(EnvironmentSetupTaskModel &a, EnvironmentSetupTaskModel &b) {
swap(a.protocol, b.protocol);
}
-EnvironmentSetupTaskModel::EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel& other13) {
- location = other13.location;
- protocol = other13.protocol;
+EnvironmentSetupTaskModel::EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel& other25) {
+ location = other25.location;
+ protocol = other25.protocol;
}
-EnvironmentSetupTaskModel& EnvironmentSetupTaskModel::operator=(const EnvironmentSetupTaskModel& other14) {
- location = other14.location;
- protocol = other14.protocol;
+EnvironmentSetupTaskModel& EnvironmentSetupTaskModel::operator=(const EnvironmentSetupTaskModel& other26) {
+ location = other26.location;
+ protocol = other26.protocol;
return *this;
}
void EnvironmentSetupTaskModel::printTo(std::ostream& out) const {
@@ -775,9 +815,9 @@ uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* ipr
{
case 1:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast15;
- xfer += iprot->readI32(ecast15);
- this->jobSubmissionProtocol = ( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)ecast15;
+ int32_t ecast27;
+ xfer += iprot->readI32(ecast27);
+ this->jobSubmissionProtocol = ( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)ecast27;
isset_jobSubmissionProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -785,9 +825,9 @@ uint32_t JobSubmissionTaskModel::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast16;
- xfer += iprot->readI32(ecast16);
- this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast16;
+ int32_t ecast28;
+ xfer += iprot->readI32(ecast28);
+ this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast28;
isset_monitorMode = true;
} else {
xfer += iprot->skip(ftype);
@@ -848,17 +888,17 @@ void swap(JobSubmissionTaskModel &a, JobSubmissionTaskModel &b) {
swap(a.__isset, b.__isset);
}
-JobSubmissionTaskModel::JobSubmissionTaskModel(const JobSubmissionTaskModel& other17) {
- jobSubmissionProtocol = other17.jobSubmissionProtocol;
- monitorMode = other17.monitorMode;
- wallTime = other17.wallTime;
- __isset = other17.__isset;
+JobSubmissionTaskModel::JobSubmissionTaskModel(const JobSubmissionTaskModel& other29) {
+ jobSubmissionProtocol = other29.jobSubmissionProtocol;
+ monitorMode = other29.monitorMode;
+ wallTime = other29.wallTime;
+ __isset = other29.__isset;
}
-JobSubmissionTaskModel& JobSubmissionTaskModel::operator=(const JobSubmissionTaskModel& other18) {
- jobSubmissionProtocol = other18.jobSubmissionProtocol;
- monitorMode = other18.monitorMode;
- wallTime = other18.wallTime;
- __isset = other18.__isset;
+JobSubmissionTaskModel& JobSubmissionTaskModel::operator=(const JobSubmissionTaskModel& other30) {
+ jobSubmissionProtocol = other30.jobSubmissionProtocol;
+ monitorMode = other30.monitorMode;
+ wallTime = other30.wallTime;
+ __isset = other30.__isset;
return *this;
}
void JobSubmissionTaskModel::printTo(std::ostream& out) const {
@@ -903,9 +943,9 @@ uint32_t MonitorTaskModel::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast19;
- xfer += iprot->readI32(ecast19);
- this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast19;
+ int32_t ecast31;
+ xfer += iprot->readI32(ecast31);
+ this->monitorMode = ( ::apache::airavata::model::appcatalog::computeresource::MonitorMode::type)ecast31;
isset_monitorMode = true;
} else {
xfer += iprot->skip(ftype);
@@ -944,11 +984,11 @@ void swap(MonitorTaskModel &a, MonitorTaskModel &b) {
swap(a.monitorMode, b.monitorMode);
}
-MonitorTaskModel::MonitorTaskModel(const MonitorTaskModel& other20) {
- monitorMode = other20.monitorMode;
+MonitorTaskModel::MonitorTaskModel(const MonitorTaskModel& other32) {
+ monitorMode = other32.monitorMode;
}
-MonitorTaskModel& MonitorTaskModel::operator=(const MonitorTaskModel& other21) {
- monitorMode = other21.monitorMode;
+MonitorTaskModel& MonitorTaskModel::operator=(const MonitorTaskModel& other33) {
+ monitorMode = other33.monitorMode;
return *this;
}
void MonitorTaskModel::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
index 8f18441..8a98904 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
@@ -97,10 +97,10 @@ class TaskModel {
std::string parentProcessId;
int64_t creationTime;
int64_t lastUpdateTime;
- ::apache::airavata::model::status::TaskStatus taskStatus;
+ std::vector< ::apache::airavata::model::status::TaskStatus> taskStatus;
std::string taskDetail;
std::string subTaskModel;
- ::apache::airavata::model::commons::ErrorModel taskError;
+ std::vector< ::apache::airavata::model::commons::ErrorModel> taskError;
std::vector< ::apache::airavata::model::job::JobModel> jobs;
_TaskModel__isset __isset;
@@ -115,13 +115,13 @@ class TaskModel {
void __set_lastUpdateTime(const int64_t val);
- void __set_taskStatus(const ::apache::airavata::model::status::TaskStatus& val);
+ void __set_taskStatus(const std::vector< ::apache::airavata::model::status::TaskStatus> & val);
void __set_taskDetail(const std::string& val);
void __set_subTaskModel(const std::string& val);
- void __set_taskError(const ::apache::airavata::model::commons::ErrorModel& val);
+ void __set_taskError(const std::vector< ::apache::airavata::model::commons::ErrorModel> & val);
void __set_jobs(const std::vector< ::apache::airavata::model::job::JobModel> & val);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
index 2997652..b655020 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Task/Types.php
@@ -89,7 +89,7 @@ class TaskModel {
*/
public $lastUpdateTime = null;
/**
- * @var \Airavata\Model\Status\TaskStatus
+ * @var \Airavata\Model\Status\TaskStatus[]
*/
public $taskStatus = null;
/**
@@ -101,7 +101,7 @@ class TaskModel {
*/
public $subTaskModel = null;
/**
- * @var \Airavata\Model\Commons\ErrorModel
+ * @var \Airavata\Model\Commons\ErrorModel[]
*/
public $taskError = null;
/**
@@ -134,8 +134,12 @@ class TaskModel {
),
6 => array(
'var' => 'taskStatus',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Status\TaskStatus',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Status\TaskStatus',
+ ),
),
7 => array(
'var' => 'taskDetail',
@@ -147,8 +151,12 @@ class TaskModel {
),
9 => array(
'var' => 'taskError',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Commons\ErrorModel',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Commons\ErrorModel',
+ ),
),
10 => array(
'var' => 'jobs',
@@ -250,9 +258,19 @@ class TaskModel {
}
break;
case 6:
- if ($ftype == TType::STRUCT) {
- $this->taskStatus = new \Airavata\Model\Status\TaskStatus();
- $xfer += $this->taskStatus->read($input);
+ if ($ftype == TType::LST) {
+ $this->taskStatus = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Status\TaskStatus();
+ $xfer += $elem5->read($input);
+ $this->taskStatus []= $elem5;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -272,9 +290,19 @@ class TaskModel {
}
break;
case 9:
- if ($ftype == TType::STRUCT) {
- $this->taskError = new \Airavata\Model\Commons\ErrorModel();
- $xfer += $this->taskError->read($input);
+ if ($ftype == TType::LST) {
+ $this->taskError = array();
+ $_size6 = 0;
+ $_etype9 = 0;
+ $xfer += $input->readListBegin($_etype9, $_size6);
+ for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+ {
+ $elem11 = null;
+ $elem11 = new \Airavata\Model\Commons\ErrorModel();
+ $xfer += $elem11->read($input);
+ $this->taskError []= $elem11;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -282,15 +310,15 @@ class TaskModel {
case 10:
if ($ftype == TType::LST) {
$this->jobs = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size12 = 0;
+ $_etype15 = 0;
+ $xfer += $input->readListBegin($_etype15, $_size12);
+ for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
{
- $elem5 = null;
- $elem5 = new \Airavata\Model\Job\JobModel();
- $xfer += $elem5->read($input);
- $this->jobs []= $elem5;
+ $elem17 = null;
+ $elem17 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem17->read($input);
+ $this->jobs []= $elem17;
}
$xfer += $input->readListEnd();
} else {
@@ -336,11 +364,20 @@ class TaskModel {
$xfer += $output->writeFieldEnd();
}
if ($this->taskStatus !== null) {
- if (!is_object($this->taskStatus)) {
+ if (!is_array($this->taskStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('taskStatus', TType::STRUCT, 6);
- $xfer += $this->taskStatus->write($output);
+ $xfer += $output->writeFieldBegin('taskStatus', TType::LST, 6);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->taskStatus));
+ {
+ foreach ($this->taskStatus as $iter18)
+ {
+ $xfer += $iter18->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->taskDetail !== null) {
@@ -354,11 +391,20 @@ class TaskModel {
$xfer += $output->writeFieldEnd();
}
if ($this->taskError !== null) {
- if (!is_object($this->taskError)) {
+ if (!is_array($this->taskError)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('taskError', TType::STRUCT, 9);
- $xfer += $this->taskError->write($output);
+ $xfer += $output->writeFieldBegin('taskError', TType::LST, 9);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->taskError));
+ {
+ foreach ($this->taskError as $iter19)
+ {
+ $xfer += $iter19->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->jobs !== null) {
@@ -369,9 +415,9 @@ class TaskModel {
{
$output->writeListBegin(TType::STRUCT, count($this->jobs));
{
- foreach ($this->jobs as $iter6)
+ foreach ($this->jobs as $iter20)
{
- $xfer += $iter6->write($output);
+ $xfer += $iter20->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/job/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/job/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/job/Types.php
index 22453c1..8f50b70 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/job/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/job/Types.php
@@ -41,7 +41,7 @@ class JobModel {
*/
public $creationTime = null;
/**
- * @var \Airavata\Model\Status\JobStatus
+ * @var \Airavata\Model\Status\JobStatus[]
*/
public $jobStatus = null;
/**
@@ -94,8 +94,12 @@ class JobModel {
),
6 => array(
'var' => 'jobStatus',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Status\JobStatus',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Status\JobStatus',
+ ),
),
7 => array(
'var' => 'computeResourceConsumed',
@@ -218,9 +222,19 @@ class JobModel {
}
break;
case 6:
- if ($ftype == TType::STRUCT) {
- $this->jobStatus = new \Airavata\Model\Status\JobStatus();
- $xfer += $this->jobStatus->read($input);
+ if ($ftype == TType::LST) {
+ $this->jobStatus = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Status\JobStatus();
+ $xfer += $elem5->read($input);
+ $this->jobStatus []= $elem5;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -306,11 +320,20 @@ class JobModel {
$xfer += $output->writeFieldEnd();
}
if ($this->jobStatus !== null) {
- if (!is_object($this->jobStatus)) {
+ if (!is_array($this->jobStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('jobStatus', TType::STRUCT, 6);
- $xfer += $this->jobStatus->write($output);
+ $xfer += $output->writeFieldBegin('jobStatus', TType::LST, 6);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->jobStatus));
+ {
+ foreach ($this->jobStatus as $iter6)
+ {
+ $xfer += $iter6->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->computeResourceConsumed !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/job/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/job/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/job/ttypes.py
index 8c8f881..111d241 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/job/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/job/ttypes.py
@@ -43,7 +43,7 @@ class JobModel:
(3, TType.STRING, 'processId', None, None, ), # 3
(4, TType.STRING, 'jobDescription', None, None, ), # 4
(5, TType.I64, 'creationTime', None, None, ), # 5
- (6, TType.STRUCT, 'jobStatus', (apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec), None, ), # 6
+ (6, TType.LIST, 'jobStatus', (TType.STRUCT,(apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec)), None, ), # 6
(7, TType.STRING, 'computeResourceConsumed', None, None, ), # 7
(8, TType.STRING, 'jobName', None, None, ), # 8
(9, TType.STRING, 'workingDir', None, None, ), # 9
@@ -101,9 +101,14 @@ class JobModel:
else:
iprot.skip(ftype)
elif fid == 6:
- if ftype == TType.STRUCT:
- self.jobStatus = apache.airavata.model.status.ttypes.JobStatus()
- self.jobStatus.read(iprot)
+ if ftype == TType.LIST:
+ self.jobStatus = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = apache.airavata.model.status.ttypes.JobStatus()
+ _elem5.read(iprot)
+ self.jobStatus.append(_elem5)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 7:
@@ -167,8 +172,11 @@ class JobModel:
oprot.writeI64(self.creationTime)
oprot.writeFieldEnd()
if self.jobStatus is not None:
- oprot.writeFieldBegin('jobStatus', TType.STRUCT, 6)
- self.jobStatus.write(oprot)
+ oprot.writeFieldBegin('jobStatus', TType.LIST, 6)
+ oprot.writeListBegin(TType.STRUCT, len(self.jobStatus))
+ for iter6 in self.jobStatus:
+ iter6.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.computeResourceConsumed is not None:
oprot.writeFieldBegin('computeResourceConsumed', TType.STRING, 7)
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
index ff6d729..9699f7b 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/task/ttypes.py
@@ -108,10 +108,10 @@ class TaskModel:
(3, TType.STRING, 'parentProcessId', None, None, ), # 3
(4, TType.I64, 'creationTime', None, None, ), # 4
(5, TType.I64, 'lastUpdateTime', None, None, ), # 5
- (6, TType.STRUCT, 'taskStatus', (apache.airavata.model.status.ttypes.TaskStatus, apache.airavata.model.status.ttypes.TaskStatus.thrift_spec), None, ), # 6
+ (6, TType.LIST, 'taskStatus', (TType.STRUCT,(apache.airavata.model.status.ttypes.TaskStatus, apache.airavata.model.status.ttypes.TaskStatus.thrift_spec)), None, ), # 6
(7, TType.STRING, 'taskDetail', None, None, ), # 7
(8, TType.STRING, 'subTaskModel', None, None, ), # 8
- (9, TType.STRUCT, 'taskError', (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), None, ), # 9
+ (9, TType.LIST, 'taskError', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 9
(10, TType.LIST, 'jobs', (TType.STRUCT,(apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec)), None, ), # 10
)
@@ -162,9 +162,14 @@ class TaskModel:
else:
iprot.skip(ftype)
elif fid == 6:
- if ftype == TType.STRUCT:
- self.taskStatus = apache.airavata.model.status.ttypes.TaskStatus()
- self.taskStatus.read(iprot)
+ if ftype == TType.LIST:
+ self.taskStatus = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = apache.airavata.model.status.ttypes.TaskStatus()
+ _elem5.read(iprot)
+ self.taskStatus.append(_elem5)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 7:
@@ -178,19 +183,24 @@ class TaskModel:
else:
iprot.skip(ftype)
elif fid == 9:
- if ftype == TType.STRUCT:
- self.taskError = apache.airavata.model.commons.ttypes.ErrorModel()
- self.taskError.read(iprot)
+ if ftype == TType.LIST:
+ self.taskError = []
+ (_etype9, _size6) = iprot.readListBegin()
+ for _i10 in xrange(_size6):
+ _elem11 = apache.airavata.model.commons.ttypes.ErrorModel()
+ _elem11.read(iprot)
+ self.taskError.append(_elem11)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 10:
if ftype == TType.LIST:
self.jobs = []
- (_etype3, _size0) = iprot.readListBegin()
- for _i4 in xrange(_size0):
- _elem5 = apache.airavata.model.job.ttypes.JobModel()
- _elem5.read(iprot)
- self.jobs.append(_elem5)
+ (_etype15, _size12) = iprot.readListBegin()
+ for _i16 in xrange(_size12):
+ _elem17 = apache.airavata.model.job.ttypes.JobModel()
+ _elem17.read(iprot)
+ self.jobs.append(_elem17)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -225,8 +235,11 @@ class TaskModel:
oprot.writeI64(self.lastUpdateTime)
oprot.writeFieldEnd()
if self.taskStatus is not None:
- oprot.writeFieldBegin('taskStatus', TType.STRUCT, 6)
- self.taskStatus.write(oprot)
+ oprot.writeFieldBegin('taskStatus', TType.LIST, 6)
+ oprot.writeListBegin(TType.STRUCT, len(self.taskStatus))
+ for iter18 in self.taskStatus:
+ iter18.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.taskDetail is not None:
oprot.writeFieldBegin('taskDetail', TType.STRING, 7)
@@ -237,14 +250,17 @@ class TaskModel:
oprot.writeString(self.subTaskModel)
oprot.writeFieldEnd()
if self.taskError is not None:
- oprot.writeFieldBegin('taskError', TType.STRUCT, 9)
- self.taskError.write(oprot)
+ oprot.writeFieldBegin('taskError', TType.LIST, 9)
+ oprot.writeListBegin(TType.STRUCT, len(self.taskError))
+ for iter19 in self.taskError:
+ iter19.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.jobs is not None:
oprot.writeFieldBegin('jobs', TType.LIST, 10)
oprot.writeListBegin(TType.STRUCT, len(self.jobs))
- for iter6 in self.jobs:
- iter6.write(oprot)
+ for iter20 in self.jobs:
+ iter20.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/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 f624be9..d14c50e 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
@@ -23,32 +23,15 @@
*/
package org.apache.airavata.model.job;
+import org.apache.thrift.EncodingUtils;
+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.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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.*;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
@@ -60,7 +43,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
private static final org.apache.thrift.protocol.TField PROCESS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("processId", org.apache.thrift.protocol.TType.STRING, (short)3);
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)4);
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)5);
- 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)6);
+ private static final org.apache.thrift.protocol.TField JOB_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStatuses", org.apache.thrift.protocol.TType.LIST, (short)6);
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);
@@ -79,7 +62,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
private String processId; // required
private String jobDescription; // required
private long creationTime; // optional
- private org.apache.airavata.model.status.JobStatus jobStatus; // optional
+ private List<org.apache.airavata.model.status.JobStatus> jobStatuses; // optional
private String computeResourceConsumed; // optional
private String jobName; // optional
private String workingDir; // optional
@@ -94,7 +77,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
PROCESS_ID((short)3, "processId"),
JOB_DESCRIPTION((short)4, "jobDescription"),
CREATION_TIME((short)5, "creationTime"),
- JOB_STATUS((short)6, "jobStatus"),
+ JOB_STATUS((short)6, "jobStatuses"),
COMPUTE_RESOURCE_CONSUMED((short)7, "computeResourceConsumed"),
JOB_NAME((short)8, "jobName"),
WORKING_DIR((short)9, "workingDir"),
@@ -196,8 +179,9 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
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,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.JOB_STATUS, new org.apache.thrift.meta_data.FieldMetaData("jobStatus", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.JobStatus.class)));
+ tmpMap.put(_Fields.JOB_STATUS, new org.apache.thrift.meta_data.FieldMetaData("jobStatuses", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.JobStatus.class))));
tmpMap.put(_Fields.COMPUTE_RESOURCE_CONSUMED, new org.apache.thrift.meta_data.FieldMetaData("computeResourceConsumed", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.JOB_NAME, new org.apache.thrift.meta_data.FieldMetaData("jobName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -249,7 +233,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
this.creationTime = other.creationTime;
if (other.isSetJobStatus()) {
- this.jobStatus = new org.apache.airavata.model.status.JobStatus(other.jobStatus);
+ List<org.apache.airavata.model.status.JobStatus> __this__jobStatus = new ArrayList<org.apache.airavata.model.status.JobStatus>(other.jobStatuses.size());
+ for (org.apache.airavata.model.status.JobStatus other_element : other.jobStatuses) {
+ __this__jobStatus.add(new org.apache.airavata.model.status.JobStatus(other_element));
+ }
+ this.jobStatuses = __this__jobStatus;
}
if (other.isSetComputeResourceConsumed()) {
this.computeResourceConsumed = other.computeResourceConsumed;
@@ -281,7 +269,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
this.jobDescription = null;
setCreationTimeIsSet(false);
this.creationTime = 0;
- this.jobStatus = null;
+ this.jobStatuses = null;
this.computeResourceConsumed = null;
this.jobName = null;
this.workingDir = null;
@@ -405,26 +393,41 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATIONTIME_ISSET_ID, value);
}
- public org.apache.airavata.model.status.JobStatus getJobStatus() {
- return this.jobStatus;
+ public int getJobStatusSize() {
+ return (this.jobStatuses == null) ? 0 : this.jobStatuses.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.status.JobStatus> getJobStatusIterator() {
+ return (this.jobStatuses == null) ? null : this.jobStatuses.iterator();
}
- public void setJobStatus(org.apache.airavata.model.status.JobStatus jobStatus) {
- this.jobStatus = jobStatus;
+ public void addToJobStatus(org.apache.airavata.model.status.JobStatus elem) {
+ if (this.jobStatuses == null) {
+ this.jobStatuses = new ArrayList<org.apache.airavata.model.status.JobStatus>();
+ }
+ this.jobStatuses.add(elem);
+ }
+
+ public List<org.apache.airavata.model.status.JobStatus> getJobStatuses() {
+ return this.jobStatuses;
+ }
+
+ public void setJobStatuses(List<org.apache.airavata.model.status.JobStatus> jobStatuses) {
+ this.jobStatuses = jobStatuses;
}
public void unsetJobStatus() {
- this.jobStatus = null;
+ this.jobStatuses = null;
}
- /** Returns true if field jobStatus is set (has been assigned a value) and false otherwise */
+ /** Returns true if field jobStatuses is set (has been assigned a value) and false otherwise */
public boolean isSetJobStatus() {
- return this.jobStatus != null;
+ return this.jobStatuses != null;
}
public void setJobStatusIsSet(boolean value) {
if (!value) {
- this.jobStatus = null;
+ this.jobStatuses = null;
}
}
@@ -611,7 +614,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (value == null) {
unsetJobStatus();
} else {
- setJobStatus((org.apache.airavata.model.status.JobStatus)value);
+ setJobStatuses((List<org.apache.airavata.model.status.JobStatus>) value);
}
break;
@@ -684,7 +687,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return getCreationTime();
case JOB_STATUS:
- return getJobStatus();
+ return getJobStatuses();
case COMPUTE_RESOURCE_CONSUMED:
return getComputeResourceConsumed();
@@ -806,7 +809,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
if (this_present_jobStatus || that_present_jobStatus) {
if (!(this_present_jobStatus && that_present_jobStatus))
return false;
- if (!this.jobStatus.equals(that.jobStatus))
+ if (!this.jobStatuses.equals(that.jobStatuses))
return false;
}
@@ -899,7 +902,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
boolean present_jobStatus = true && (isSetJobStatus());
list.add(present_jobStatus);
if (present_jobStatus)
- list.add(jobStatus);
+ list.add(jobStatuses);
boolean present_computeResourceConsumed = true && (isSetComputeResourceConsumed());
list.add(present_computeResourceConsumed);
@@ -997,7 +1000,7 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
return lastComparison;
}
if (isSetJobStatus()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobStatus, other.jobStatus);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobStatuses, other.jobStatuses);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1121,11 +1124,11 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
if (isSetJobStatus()) {
if (!first) sb.append(", ");
- sb.append("jobStatus:");
- if (this.jobStatus == null) {
+ sb.append("jobStatuses:");
+ if (this.jobStatuses == null) {
sb.append("null");
} else {
- sb.append(this.jobStatus);
+ sb.append(this.jobStatuses);
}
first = false;
}
@@ -1208,9 +1211,6 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
// check for sub-struct validity
- if (jobStatus != null) {
- jobStatus.validate();
- }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1290,9 +1290,19 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
}
break;
case 6: // JOB_STATUS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
- struct.jobStatus.read(iprot);
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.jobStatuses = new ArrayList<org.apache.airavata.model.status.JobStatus>(_list0.size);
+ org.apache.airavata.model.status.JobStatus _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new org.apache.airavata.model.status.JobStatus();
+ _elem1.read(iprot);
+ struct.jobStatuses.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
struct.setJobStatusIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1384,10 +1394,17 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
oprot.writeI64(struct.creationTime);
oprot.writeFieldEnd();
}
- if (struct.jobStatus != null) {
+ if (struct.jobStatuses != null) {
if (struct.isSetJobStatus()) {
oprot.writeFieldBegin(JOB_STATUS_FIELD_DESC);
- struct.jobStatus.write(oprot);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobStatuses.size()));
+ for (org.apache.airavata.model.status.JobStatus _iter3 : struct.jobStatuses)
+ {
+ _iter3.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
}
@@ -1482,7 +1499,13 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
oprot.writeI64(struct.creationTime);
}
if (struct.isSetJobStatus()) {
- struct.jobStatus.write(oprot);
+ {
+ oprot.writeI32(struct.jobStatuses.size());
+ for (org.apache.airavata.model.status.JobStatus _iter4 : struct.jobStatuses)
+ {
+ _iter4.write(oprot);
+ }
+ }
}
if (struct.isSetComputeResourceConsumed()) {
oprot.writeString(struct.computeResourceConsumed);
@@ -1521,8 +1544,17 @@ public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fie
struct.setCreationTimeIsSet(true);
}
if (incoming.get(1)) {
- struct.jobStatus = new org.apache.airavata.model.status.JobStatus();
- struct.jobStatus.read(iprot);
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.jobStatuses = new ArrayList<org.apache.airavata.model.status.JobStatus>(_list5.size);
+ org.apache.airavata.model.status.JobStatus _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ {
+ _elem6 = new org.apache.airavata.model.status.JobStatus();
+ _elem6.read(iprot);
+ struct.jobStatuses.add(_elem6);
+ }
+ }
struct.setJobStatusIsSet(true);
}
if (incoming.get(2)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/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 471d7c5..00db295 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
@@ -23,32 +23,15 @@
*/
package org.apache.airavata.model.process;
+import org.apache.thrift.EncodingUtils;
+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.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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.*;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -68,7 +51,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", 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 LAST_UPDATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastUpdateTime", org.apache.thrift.protocol.TType.I64, (short)4);
- private static final org.apache.thrift.protocol.TField PROCESS_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("processStatus", org.apache.thrift.protocol.TType.LIST, (short)5);
+ private static final org.apache.thrift.protocol.TField PROCESS_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("processStatuses", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final org.apache.thrift.protocol.TField PROCESS_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("processDetail", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)8);
@@ -78,7 +61,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final org.apache.thrift.protocol.TField PROCESS_RESOURCE_SCHEDULE_FIELD_DESC = new org.apache.thrift.protocol.TField("processResourceSchedule", org.apache.thrift.protocol.TType.STRUCT, (short)12);
private static final org.apache.thrift.protocol.TField TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("tasks", org.apache.thrift.protocol.TType.LIST, (short)13);
private static final org.apache.thrift.protocol.TField TASK_DAG_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDag", org.apache.thrift.protocol.TType.STRING, (short)14);
- private static final org.apache.thrift.protocol.TField PROCESS_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("processError", org.apache.thrift.protocol.TType.LIST, (short)15);
+ private static final org.apache.thrift.protocol.TField PROCESS_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("processErrors", org.apache.thrift.protocol.TType.LIST, (short)15);
private static final org.apache.thrift.protocol.TField GATEWAY_EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayExecutionId", org.apache.thrift.protocol.TType.STRING, (short)16);
private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)17);
private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)18);
@@ -98,7 +81,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private String experimentId; // required
private long creationTime; // optional
private long lastUpdateTime; // optional
- private List<org.apache.airavata.model.status.ProcessStatus> processStatus; // optional
+ private List<org.apache.airavata.model.status.ProcessStatus> processStatuses; // optional
private String processDetail; // optional
private String applicationInterfaceId; // optional
private String applicationDeploymentId; // optional
@@ -108,7 +91,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel processResourceSchedule; // optional
private List<org.apache.airavata.model.task.TaskModel> tasks; // optional
private String taskDag; // optional
- private List<org.apache.airavata.model.commons.ErrorModel> processError; // optional
+ private List<org.apache.airavata.model.commons.ErrorModel> processErrors; // optional
private String gatewayExecutionId; // optional
private boolean enableEmailNotification; // optional
private List<String> emailAddresses; // optional
@@ -124,7 +107,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
EXPERIMENT_ID((short)2, "experimentId"),
CREATION_TIME((short)3, "creationTime"),
LAST_UPDATE_TIME((short)4, "lastUpdateTime"),
- PROCESS_STATUS((short)5, "processStatus"),
+ PROCESS_STATUS((short)5, "processStatuses"),
PROCESS_DETAIL((short)6, "processDetail"),
APPLICATION_INTERFACE_ID((short)7, "applicationInterfaceId"),
APPLICATION_DEPLOYMENT_ID((short)8, "applicationDeploymentId"),
@@ -134,7 +117,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
PROCESS_RESOURCE_SCHEDULE((short)12, "processResourceSchedule"),
TASKS((short)13, "tasks"),
TASK_DAG((short)14, "taskDag"),
- PROCESS_ERROR((short)15, "processError"),
+ PROCESS_ERROR((short)15, "processErrors"),
GATEWAY_EXECUTION_ID((short)16, "gatewayExecutionId"),
ENABLE_EMAIL_NOTIFICATION((short)17, "enableEmailNotification"),
EMAIL_ADDRESSES((short)18, "emailAddresses"),
@@ -260,7 +243,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.LAST_UPDATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastUpdateTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.PROCESS_STATUS, new org.apache.thrift.meta_data.FieldMetaData("processStatus", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.PROCESS_STATUS, new org.apache.thrift.meta_data.FieldMetaData("processStatuses", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.ProcessStatus.class))));
tmpMap.put(_Fields.PROCESS_DETAIL, new org.apache.thrift.meta_data.FieldMetaData("processDetail", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -284,7 +267,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.task.TaskModel.class))));
tmpMap.put(_Fields.TASK_DAG, new org.apache.thrift.meta_data.FieldMetaData("taskDag", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.PROCESS_ERROR, new org.apache.thrift.meta_data.FieldMetaData("processError", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.PROCESS_ERROR, new org.apache.thrift.meta_data.FieldMetaData("processErrors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
tmpMap.put(_Fields.GATEWAY_EXECUTION_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayExecutionId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -338,11 +321,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.creationTime = other.creationTime;
this.lastUpdateTime = other.lastUpdateTime;
if (other.isSetProcessStatus()) {
- List<org.apache.airavata.model.status.ProcessStatus> __this__processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(other.processStatus.size());
- for (org.apache.airavata.model.status.ProcessStatus other_element : other.processStatus) {
+ List<org.apache.airavata.model.status.ProcessStatus> __this__processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(other.processStatuses.size());
+ for (org.apache.airavata.model.status.ProcessStatus other_element : other.processStatuses) {
__this__processStatus.add(new org.apache.airavata.model.status.ProcessStatus(other_element));
}
- this.processStatus = __this__processStatus;
+ this.processStatuses = __this__processStatus;
}
if (other.isSetProcessDetail()) {
this.processDetail = other.processDetail;
@@ -384,11 +367,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.taskDag = other.taskDag;
}
if (other.isSetProcessError()) {
- List<org.apache.airavata.model.commons.ErrorModel> __this__processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.processError.size());
- for (org.apache.airavata.model.commons.ErrorModel other_element : other.processError) {
+ List<org.apache.airavata.model.commons.ErrorModel> __this__processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.processErrors.size());
+ for (org.apache.airavata.model.commons.ErrorModel other_element : other.processErrors) {
__this__processError.add(new org.apache.airavata.model.commons.ErrorModel(other_element));
}
- this.processError = __this__processError;
+ this.processErrors = __this__processError;
}
if (other.isSetGatewayExecutionId()) {
this.gatewayExecutionId = other.gatewayExecutionId;
@@ -426,7 +409,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.creationTime = 0;
setLastUpdateTimeIsSet(false);
this.lastUpdateTime = 0;
- this.processStatus = null;
+ this.processStatuses = null;
this.processDetail = null;
this.applicationInterfaceId = null;
this.applicationDeploymentId = null;
@@ -436,7 +419,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.processResourceSchedule = null;
this.tasks = null;
this.taskDag = null;
- this.processError = null;
+ this.processErrors = null;
this.gatewayExecutionId = null;
setEnableEmailNotificationIsSet(false);
this.enableEmailNotification = false;
@@ -540,40 +523,40 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
public int getProcessStatusSize() {
- return (this.processStatus == null) ? 0 : this.processStatus.size();
+ return (this.processStatuses == null) ? 0 : this.processStatuses.size();
}
public java.util.Iterator<org.apache.airavata.model.status.ProcessStatus> getProcessStatusIterator() {
- return (this.processStatus == null) ? null : this.processStatus.iterator();
+ return (this.processStatuses == null) ? null : this.processStatuses.iterator();
}
public void addToProcessStatus(org.apache.airavata.model.status.ProcessStatus elem) {
- if (this.processStatus == null) {
- this.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>();
+ if (this.processStatuses == null) {
+ this.processStatuses = new ArrayList<org.apache.airavata.model.status.ProcessStatus>();
}
- this.processStatus.add(elem);
+ this.processStatuses.add(elem);
}
- public List<org.apache.airavata.model.status.ProcessStatus> getProcessStatus() {
- return this.processStatus;
+ public List<org.apache.airavata.model.status.ProcessStatus> getProcessStatuses() {
+ return this.processStatuses;
}
- public void setProcessStatus(List<org.apache.airavata.model.status.ProcessStatus> processStatus) {
- this.processStatus = processStatus;
+ public void setProcessStatuses(List<org.apache.airavata.model.status.ProcessStatus> processStatuses) {
+ this.processStatuses = processStatuses;
}
public void unsetProcessStatus() {
- this.processStatus = null;
+ this.processStatuses = null;
}
- /** Returns true if field processStatus is set (has been assigned a value) and false otherwise */
+ /** Returns true if field processStatuses is set (has been assigned a value) and false otherwise */
public boolean isSetProcessStatus() {
- return this.processStatus != null;
+ return this.processStatuses != null;
}
public void setProcessStatusIsSet(boolean value) {
if (!value) {
- this.processStatus = null;
+ this.processStatuses = null;
}
}
@@ -830,40 +813,40 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
public int getProcessErrorSize() {
- return (this.processError == null) ? 0 : this.processError.size();
+ return (this.processErrors == null) ? 0 : this.processErrors.size();
}
public java.util.Iterator<org.apache.airavata.model.commons.ErrorModel> getProcessErrorIterator() {
- return (this.processError == null) ? null : this.processError.iterator();
+ return (this.processErrors == null) ? null : this.processErrors.iterator();
}
public void addToProcessError(org.apache.airavata.model.commons.ErrorModel elem) {
- if (this.processError == null) {
- this.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>();
+ if (this.processErrors == null) {
+ this.processErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>();
}
- this.processError.add(elem);
+ this.processErrors.add(elem);
}
- public List<org.apache.airavata.model.commons.ErrorModel> getProcessError() {
- return this.processError;
+ public List<org.apache.airavata.model.commons.ErrorModel> getProcessErrors() {
+ return this.processErrors;
}
- public void setProcessError(List<org.apache.airavata.model.commons.ErrorModel> processError) {
- this.processError = processError;
+ public void setProcessErrors(List<org.apache.airavata.model.commons.ErrorModel> processErrors) {
+ this.processErrors = processErrors;
}
public void unsetProcessError() {
- this.processError = null;
+ this.processErrors = null;
}
- /** Returns true if field processError is set (has been assigned a value) and false otherwise */
+ /** Returns true if field processErrors is set (has been assigned a value) and false otherwise */
public boolean isSetProcessError() {
- return this.processError != null;
+ return this.processErrors != null;
}
public void setProcessErrorIsSet(boolean value) {
if (!value) {
- this.processError = null;
+ this.processErrors = null;
}
}
@@ -1102,7 +1085,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (value == null) {
unsetProcessStatus();
} else {
- setProcessStatus((List<org.apache.airavata.model.status.ProcessStatus>)value);
+ setProcessStatuses((List<org.apache.airavata.model.status.ProcessStatus>) value);
}
break;
@@ -1182,7 +1165,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (value == null) {
unsetProcessError();
} else {
- setProcessError((List<org.apache.airavata.model.commons.ErrorModel>)value);
+ setProcessErrors((List<org.apache.airavata.model.commons.ErrorModel>) value);
}
break;
@@ -1268,7 +1251,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return getLastUpdateTime();
case PROCESS_STATUS:
- return getProcessStatus();
+ return getProcessStatuses();
case PROCESS_DETAIL:
return getProcessDetail();
@@ -1298,7 +1281,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return getTaskDag();
case PROCESS_ERROR:
- return getProcessError();
+ return getProcessErrors();
case GATEWAY_EXECUTION_ID:
return getGatewayExecutionId();
@@ -1439,7 +1422,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (this_present_processStatus || that_present_processStatus) {
if (!(this_present_processStatus && that_present_processStatus))
return false;
- if (!this.processStatus.equals(that.processStatus))
+ if (!this.processStatuses.equals(that.processStatuses))
return false;
}
@@ -1529,7 +1512,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (this_present_processError || that_present_processError) {
if (!(this_present_processError && that_present_processError))
return false;
- if (!this.processError.equals(that.processError))
+ if (!this.processErrors.equals(that.processErrors))
return false;
}
@@ -1635,7 +1618,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
boolean present_processStatus = true && (isSetProcessStatus());
list.add(present_processStatus);
if (present_processStatus)
- list.add(processStatus);
+ list.add(processStatuses);
boolean present_processDetail = true && (isSetProcessDetail());
list.add(present_processDetail);
@@ -1685,7 +1668,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
boolean present_processError = true && (isSetProcessError());
list.add(present_processError);
if (present_processError)
- list.add(processError);
+ list.add(processErrors);
boolean present_gatewayExecutionId = true && (isSetGatewayExecutionId());
list.add(present_gatewayExecutionId);
@@ -1783,7 +1766,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return lastComparison;
}
if (isSetProcessStatus()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processStatus, other.processStatus);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processStatuses, other.processStatuses);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1883,7 +1866,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return lastComparison;
}
if (isSetProcessError()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processError, other.processError);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processErrors, other.processErrors);
if (lastComparison != 0) {
return lastComparison;
}
@@ -2017,11 +2000,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (isSetProcessStatus()) {
if (!first) sb.append(", ");
- sb.append("processStatus:");
- if (this.processStatus == null) {
+ sb.append("processStatuses:");
+ if (this.processStatuses == null) {
sb.append("null");
} else {
- sb.append(this.processStatus);
+ sb.append(this.processStatuses);
}
first = false;
}
@@ -2117,11 +2100,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (isSetProcessError()) {
if (!first) sb.append(", ");
- sb.append("processError:");
- if (this.processError == null) {
+ sb.append("processErrors:");
+ if (this.processErrors == null) {
sb.append("null");
} else {
- sb.append(this.processError);
+ sb.append(this.processErrors);
}
first = false;
}
@@ -2289,13 +2272,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list0.size);
+ struct.processStatuses = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list0.size);
org.apache.airavata.model.status.ProcessStatus _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{
_elem1 = new org.apache.airavata.model.status.ProcessStatus();
_elem1.read(iprot);
- struct.processStatus.add(_elem1);
+ struct.processStatuses.add(_elem1);
}
iprot.readListEnd();
}
@@ -2414,13 +2397,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
- struct.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list12.size);
+ struct.processErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list12.size);
org.apache.airavata.model.commons.ErrorModel _elem13;
for (int _i14 = 0; _i14 < _list12.size; ++_i14)
{
_elem13 = new org.apache.airavata.model.commons.ErrorModel();
_elem13.read(iprot);
- struct.processError.add(_elem13);
+ struct.processErrors.add(_elem13);
}
iprot.readListEnd();
}
@@ -2536,12 +2519,12 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeI64(struct.lastUpdateTime);
oprot.writeFieldEnd();
}
- if (struct.processStatus != null) {
+ if (struct.processStatuses != null) {
if (struct.isSetProcessStatus()) {
oprot.writeFieldBegin(PROCESS_STATUS_FIELD_DESC);
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processStatus.size()));
- for (org.apache.airavata.model.status.ProcessStatus _iter18 : struct.processStatus)
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processStatuses.size()));
+ for (org.apache.airavata.model.status.ProcessStatus _iter18 : struct.processStatuses)
{
_iter18.write(oprot);
}
@@ -2634,12 +2617,12 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldEnd();
}
}
- if (struct.processError != null) {
+ if (struct.processErrors != null) {
if (struct.isSetProcessError()) {
oprot.writeFieldBegin(PROCESS_ERROR_FIELD_DESC);
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processError.size()));
- for (org.apache.airavata.model.commons.ErrorModel _iter22 : struct.processError)
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processErrors.size()));
+ for (org.apache.airavata.model.commons.ErrorModel _iter22 : struct.processErrors)
{
_iter22.write(oprot);
}
@@ -2799,8 +2782,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (struct.isSetProcessStatus()) {
{
- oprot.writeI32(struct.processStatus.size());
- for (org.apache.airavata.model.status.ProcessStatus _iter24 : struct.processStatus)
+ oprot.writeI32(struct.processStatuses.size());
+ for (org.apache.airavata.model.status.ProcessStatus _iter24 : struct.processStatuses)
{
_iter24.write(oprot);
}
@@ -2853,8 +2836,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (struct.isSetProcessError()) {
{
- oprot.writeI32(struct.processError.size());
- for (org.apache.airavata.model.commons.ErrorModel _iter28 : struct.processError)
+ oprot.writeI32(struct.processErrors.size());
+ for (org.apache.airavata.model.commons.ErrorModel _iter28 : struct.processErrors)
{
_iter28.write(oprot);
}
@@ -2911,13 +2894,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list30.size);
+ struct.processStatuses = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list30.size);
org.apache.airavata.model.status.ProcessStatus _elem31;
for (int _i32 = 0; _i32 < _list30.size; ++_i32)
{
_elem31 = new org.apache.airavata.model.status.ProcessStatus();
_elem31.read(iprot);
- struct.processStatus.add(_elem31);
+ struct.processStatuses.add(_elem31);
}
}
struct.setProcessStatusIsSet(true);
@@ -2992,13 +2975,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (incoming.get(12)) {
{
org.apache.thrift.protocol.TList _list42 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list42.size);
+ struct.processErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list42.size);
org.apache.airavata.model.commons.ErrorModel _elem43;
for (int _i44 = 0; _i44 < _list42.size; ++_i44)
{
_elem43 = new org.apache.airavata.model.commons.ErrorModel();
_elem43.read(iprot);
- struct.processError.add(_elem43);
+ struct.processErrors.add(_elem43);
}
}
struct.setProcessErrorIsSet(true);
[08/10] airavata git commit: making errors and statuses list in
Process and Task models
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/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 3d6450f..5ebdacf 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
@@ -23,32 +23,16 @@
*/
package org.apache.airavata.model.task;
+import org.apache.thrift.EncodingUtils;
+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.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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.nio.ByteBuffer;
+import java.util.*;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**
@@ -69,10 +53,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
private static final org.apache.thrift.protocol.TField PARENT_PROCESS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentProcessId", 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 LAST_UPDATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastUpdateTime", org.apache.thrift.protocol.TType.I64, (short)5);
- private static final org.apache.thrift.protocol.TField TASK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskStatus", org.apache.thrift.protocol.TType.STRUCT, (short)6);
+ private static final org.apache.thrift.protocol.TField TASK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskStatuses", org.apache.thrift.protocol.TType.LIST, (short)6);
private static final org.apache.thrift.protocol.TField TASK_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDetail", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField SUB_TASK_MODEL_FIELD_DESC = new org.apache.thrift.protocol.TField("subTaskModel", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final org.apache.thrift.protocol.TField TASK_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("taskError", org.apache.thrift.protocol.TType.STRUCT, (short)9);
+ private static final org.apache.thrift.protocol.TField TASK_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("taskErrors", org.apache.thrift.protocol.TType.LIST, (short)9);
private static final org.apache.thrift.protocol.TField JOBS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobs", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -86,10 +70,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
private String parentProcessId; // required
private long creationTime; // required
private long lastUpdateTime; // required
- private org.apache.airavata.model.status.TaskStatus taskStatus; // required
+ private List<org.apache.airavata.model.status.TaskStatus> taskStatuses; // required
private String taskDetail; // optional
private ByteBuffer subTaskModel; // optional
- private org.apache.airavata.model.commons.ErrorModel taskError; // optional
+ private List<org.apache.airavata.model.commons.ErrorModel> taskErrors; // optional
private List<org.apache.airavata.model.job.JobModel> jobs; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -103,10 +87,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
PARENT_PROCESS_ID((short)3, "parentProcessId"),
CREATION_TIME((short)4, "creationTime"),
LAST_UPDATE_TIME((short)5, "lastUpdateTime"),
- TASK_STATUS((short)6, "taskStatus"),
+ TASK_STATUS((short)6, "taskStatuses"),
TASK_DETAIL((short)7, "taskDetail"),
SUB_TASK_MODEL((short)8, "subTaskModel"),
- TASK_ERROR((short)9, "taskError"),
+ TASK_ERROR((short)9, "taskErrors"),
JOBS((short)10, "jobs");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -199,14 +183,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.LAST_UPDATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastUpdateTime", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.TASK_STATUS, new org.apache.thrift.meta_data.FieldMetaData("taskStatus", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.TaskStatus.class)));
+ tmpMap.put(_Fields.TASK_STATUS, new org.apache.thrift.meta_data.FieldMetaData("taskStatuses", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.TaskStatus.class))));
tmpMap.put(_Fields.TASK_DETAIL, new org.apache.thrift.meta_data.FieldMetaData("taskDetail", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.SUB_TASK_MODEL, new org.apache.thrift.meta_data.FieldMetaData("subTaskModel", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- tmpMap.put(_Fields.TASK_ERROR, new org.apache.thrift.meta_data.FieldMetaData("taskError", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class)));
+ tmpMap.put(_Fields.TASK_ERROR, new org.apache.thrift.meta_data.FieldMetaData("taskErrors", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
tmpMap.put(_Fields.JOBS, new org.apache.thrift.meta_data.FieldMetaData("jobs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.job.JobModel.class))));
@@ -225,7 +211,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
String parentProcessId,
long creationTime,
long lastUpdateTime,
- org.apache.airavata.model.status.TaskStatus taskStatus)
+ List<org.apache.airavata.model.status.TaskStatus> taskStatus)
{
this();
this.taskId = taskId;
@@ -235,7 +221,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
setCreationTimeIsSet(true);
this.lastUpdateTime = lastUpdateTime;
setLastUpdateTimeIsSet(true);
- this.taskStatus = taskStatus;
+ this.taskStatuses = taskStatus;
}
/**
@@ -255,7 +241,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
this.creationTime = other.creationTime;
this.lastUpdateTime = other.lastUpdateTime;
if (other.isSetTaskStatus()) {
- this.taskStatus = new org.apache.airavata.model.status.TaskStatus(other.taskStatus);
+ List<org.apache.airavata.model.status.TaskStatus> __this__taskStatus = new ArrayList<org.apache.airavata.model.status.TaskStatus>(other.taskStatuses.size());
+ for (org.apache.airavata.model.status.TaskStatus other_element : other.taskStatuses) {
+ __this__taskStatus.add(new org.apache.airavata.model.status.TaskStatus(other_element));
+ }
+ this.taskStatuses = __this__taskStatus;
}
if (other.isSetTaskDetail()) {
this.taskDetail = other.taskDetail;
@@ -264,7 +254,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
this.subTaskModel = org.apache.thrift.TBaseHelper.copyBinary(other.subTaskModel);
}
if (other.isSetTaskError()) {
- this.taskError = new org.apache.airavata.model.commons.ErrorModel(other.taskError);
+ List<org.apache.airavata.model.commons.ErrorModel> __this__taskError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.taskErrors.size());
+ for (org.apache.airavata.model.commons.ErrorModel other_element : other.taskErrors) {
+ __this__taskError.add(new org.apache.airavata.model.commons.ErrorModel(other_element));
+ }
+ this.taskErrors = __this__taskError;
}
if (other.isSetJobs()) {
List<org.apache.airavata.model.job.JobModel> __this__jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(other.jobs.size());
@@ -289,10 +283,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
this.creationTime = 0;
setLastUpdateTimeIsSet(false);
this.lastUpdateTime = 0;
- this.taskStatus = null;
+ this.taskStatuses = null;
this.taskDetail = null;
this.subTaskModel = null;
- this.taskError = null;
+ this.taskErrors = null;
this.jobs = null;
}
@@ -417,26 +411,41 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTUPDATETIME_ISSET_ID, value);
}
- public org.apache.airavata.model.status.TaskStatus getTaskStatus() {
- return this.taskStatus;
+ public int getTaskStatusSize() {
+ return (this.taskStatuses == null) ? 0 : this.taskStatuses.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.status.TaskStatus> getTaskStatusIterator() {
+ return (this.taskStatuses == null) ? null : this.taskStatuses.iterator();
+ }
+
+ public void addToTaskStatus(org.apache.airavata.model.status.TaskStatus elem) {
+ if (this.taskStatuses == null) {
+ this.taskStatuses = new ArrayList<org.apache.airavata.model.status.TaskStatus>();
+ }
+ this.taskStatuses.add(elem);
+ }
+
+ public List<org.apache.airavata.model.status.TaskStatus> getTaskStatuses() {
+ return this.taskStatuses;
}
- public void setTaskStatus(org.apache.airavata.model.status.TaskStatus taskStatus) {
- this.taskStatus = taskStatus;
+ public void setTaskStatuses(List<org.apache.airavata.model.status.TaskStatus> taskStatuses) {
+ this.taskStatuses = taskStatuses;
}
public void unsetTaskStatus() {
- this.taskStatus = null;
+ this.taskStatuses = null;
}
- /** Returns true if field taskStatus is set (has been assigned a value) and false otherwise */
+ /** Returns true if field taskStatuses is set (has been assigned a value) and false otherwise */
public boolean isSetTaskStatus() {
- return this.taskStatus != null;
+ return this.taskStatuses != null;
}
public void setTaskStatusIsSet(boolean value) {
if (!value) {
- this.taskStatus = null;
+ this.taskStatuses = null;
}
}
@@ -495,26 +504,41 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
}
- public org.apache.airavata.model.commons.ErrorModel getTaskError() {
- return this.taskError;
+ public int getTaskErrorSize() {
+ return (this.taskErrors == null) ? 0 : this.taskErrors.size();
}
- public void setTaskError(org.apache.airavata.model.commons.ErrorModel taskError) {
- this.taskError = taskError;
+ public java.util.Iterator<org.apache.airavata.model.commons.ErrorModel> getTaskErrorIterator() {
+ return (this.taskErrors == null) ? null : this.taskErrors.iterator();
+ }
+
+ public void addToTaskError(org.apache.airavata.model.commons.ErrorModel elem) {
+ if (this.taskErrors == null) {
+ this.taskErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>();
+ }
+ this.taskErrors.add(elem);
+ }
+
+ public List<org.apache.airavata.model.commons.ErrorModel> getTaskErrors() {
+ return this.taskErrors;
+ }
+
+ public void setTaskErrors(List<org.apache.airavata.model.commons.ErrorModel> taskErrors) {
+ this.taskErrors = taskErrors;
}
public void unsetTaskError() {
- this.taskError = null;
+ this.taskErrors = null;
}
- /** Returns true if field taskError is set (has been assigned a value) and false otherwise */
+ /** Returns true if field taskErrors is set (has been assigned a value) and false otherwise */
public boolean isSetTaskError() {
- return this.taskError != null;
+ return this.taskErrors != null;
}
public void setTaskErrorIsSet(boolean value) {
if (!value) {
- this.taskError = null;
+ this.taskErrors = null;
}
}
@@ -602,7 +626,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (value == null) {
unsetTaskStatus();
} else {
- setTaskStatus((org.apache.airavata.model.status.TaskStatus)value);
+ setTaskStatuses((List<org.apache.airavata.model.status.TaskStatus>) value);
}
break;
@@ -626,7 +650,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (value == null) {
unsetTaskError();
} else {
- setTaskError((org.apache.airavata.model.commons.ErrorModel)value);
+ setTaskErrors((List<org.apache.airavata.model.commons.ErrorModel>) value);
}
break;
@@ -659,7 +683,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return getLastUpdateTime();
case TASK_STATUS:
- return getTaskStatus();
+ return getTaskStatuses();
case TASK_DETAIL:
return getTaskDetail();
@@ -668,7 +692,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return getSubTaskModel();
case TASK_ERROR:
- return getTaskError();
+ return getTaskErrors();
case JOBS:
return getJobs();
@@ -771,7 +795,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (this_present_taskStatus || that_present_taskStatus) {
if (!(this_present_taskStatus && that_present_taskStatus))
return false;
- if (!this.taskStatus.equals(that.taskStatus))
+ if (!this.taskStatuses.equals(that.taskStatuses))
return false;
}
@@ -798,7 +822,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
if (this_present_taskError || that_present_taskError) {
if (!(this_present_taskError && that_present_taskError))
return false;
- if (!this.taskError.equals(that.taskError))
+ if (!this.taskErrors.equals(that.taskErrors))
return false;
}
@@ -846,7 +870,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
boolean present_taskStatus = true && (isSetTaskStatus());
list.add(present_taskStatus);
if (present_taskStatus)
- list.add(taskStatus);
+ list.add(taskStatuses);
boolean present_taskDetail = true && (isSetTaskDetail());
list.add(present_taskDetail);
@@ -861,7 +885,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
boolean present_taskError = true && (isSetTaskError());
list.add(present_taskError);
if (present_taskError)
- list.add(taskError);
+ list.add(taskErrors);
boolean present_jobs = true && (isSetJobs());
list.add(present_jobs);
@@ -934,7 +958,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return lastComparison;
}
if (isSetTaskStatus()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskStatus, other.taskStatus);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskStatuses, other.taskStatuses);
if (lastComparison != 0) {
return lastComparison;
}
@@ -964,7 +988,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
return lastComparison;
}
if (isSetTaskError()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskError, other.taskError);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskErrors, other.taskErrors);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1031,11 +1055,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
sb.append(this.lastUpdateTime);
first = false;
if (!first) sb.append(", ");
- sb.append("taskStatus:");
- if (this.taskStatus == null) {
+ sb.append("taskStatuses:");
+ if (this.taskStatuses == null) {
sb.append("null");
} else {
- sb.append(this.taskStatus);
+ sb.append(this.taskStatuses);
}
first = false;
if (isSetTaskDetail()) {
@@ -1060,11 +1084,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
if (isSetTaskError()) {
if (!first) sb.append(", ");
- sb.append("taskError:");
- if (this.taskError == null) {
+ sb.append("taskErrors:");
+ if (this.taskErrors == null) {
sb.append("null");
} else {
- sb.append(this.taskError);
+ sb.append(this.taskErrors);
}
first = false;
}
@@ -1105,16 +1129,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
if (!isSetTaskStatus()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskStatus' is unset! Struct:" + toString());
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'taskStatuses' is unset! Struct:" + toString());
}
// check for sub-struct validity
- if (taskStatus != null) {
- taskStatus.validate();
- }
- if (taskError != null) {
- taskError.validate();
- }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1194,9 +1212,19 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
break;
case 6: // TASK_STATUS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.taskStatus = new org.apache.airavata.model.status.TaskStatus();
- struct.taskStatus.read(iprot);
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.taskStatuses = new ArrayList<org.apache.airavata.model.status.TaskStatus>(_list0.size);
+ org.apache.airavata.model.status.TaskStatus _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new org.apache.airavata.model.status.TaskStatus();
+ _elem1.read(iprot);
+ struct.taskStatuses.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
struct.setTaskStatusIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1219,9 +1247,19 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
}
break;
case 9: // TASK_ERROR
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.taskError = new org.apache.airavata.model.commons.ErrorModel();
- struct.taskError.read(iprot);
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
+ struct.taskErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list3.size);
+ org.apache.airavata.model.commons.ErrorModel _elem4;
+ for (int _i5 = 0; _i5 < _list3.size; ++_i5)
+ {
+ _elem4 = new org.apache.airavata.model.commons.ErrorModel();
+ _elem4.read(iprot);
+ struct.taskErrors.add(_elem4);
+ }
+ iprot.readListEnd();
+ }
struct.setTaskErrorIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1230,14 +1268,14 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
case 10: // JOBS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list0.size);
- org.apache.airavata.model.job.JobModel _elem1;
- for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
+ struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list6.size);
+ org.apache.airavata.model.job.JobModel _elem7;
+ for (int _i8 = 0; _i8 < _list6.size; ++_i8)
{
- _elem1 = new org.apache.airavata.model.job.JobModel();
- _elem1.read(iprot);
- struct.jobs.add(_elem1);
+ _elem7 = new org.apache.airavata.model.job.JobModel();
+ _elem7.read(iprot);
+ struct.jobs.add(_elem7);
}
iprot.readListEnd();
}
@@ -1280,9 +1318,16 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeFieldBegin(LAST_UPDATE_TIME_FIELD_DESC);
oprot.writeI64(struct.lastUpdateTime);
oprot.writeFieldEnd();
- if (struct.taskStatus != null) {
+ if (struct.taskStatuses != null) {
oprot.writeFieldBegin(TASK_STATUS_FIELD_DESC);
- struct.taskStatus.write(oprot);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.taskStatuses.size()));
+ for (org.apache.airavata.model.status.TaskStatus _iter9 : struct.taskStatuses)
+ {
+ _iter9.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
if (struct.taskDetail != null) {
@@ -1299,10 +1344,17 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeFieldEnd();
}
}
- if (struct.taskError != null) {
+ if (struct.taskErrors != null) {
if (struct.isSetTaskError()) {
oprot.writeFieldBegin(TASK_ERROR_FIELD_DESC);
- struct.taskError.write(oprot);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.taskErrors.size()));
+ for (org.apache.airavata.model.commons.ErrorModel _iter10 : struct.taskErrors)
+ {
+ _iter10.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
}
@@ -1311,9 +1363,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeFieldBegin(JOBS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobs.size()));
- for (org.apache.airavata.model.job.JobModel _iter3 : struct.jobs)
+ for (org.apache.airavata.model.job.JobModel _iter11 : struct.jobs)
{
- _iter3.write(oprot);
+ _iter11.write(oprot);
}
oprot.writeListEnd();
}
@@ -1342,7 +1394,13 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeString(struct.parentProcessId);
oprot.writeI64(struct.creationTime);
oprot.writeI64(struct.lastUpdateTime);
- struct.taskStatus.write(oprot);
+ {
+ oprot.writeI32(struct.taskStatuses.size());
+ for (org.apache.airavata.model.status.TaskStatus _iter12 : struct.taskStatuses)
+ {
+ _iter12.write(oprot);
+ }
+ }
BitSet optionals = new BitSet();
if (struct.isSetTaskDetail()) {
optionals.set(0);
@@ -1364,14 +1422,20 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
oprot.writeBinary(struct.subTaskModel);
}
if (struct.isSetTaskError()) {
- struct.taskError.write(oprot);
+ {
+ oprot.writeI32(struct.taskErrors.size());
+ for (org.apache.airavata.model.commons.ErrorModel _iter13 : struct.taskErrors)
+ {
+ _iter13.write(oprot);
+ }
+ }
}
if (struct.isSetJobs()) {
{
oprot.writeI32(struct.jobs.size());
- for (org.apache.airavata.model.job.JobModel _iter4 : struct.jobs)
+ for (org.apache.airavata.model.job.JobModel _iter14 : struct.jobs)
{
- _iter4.write(oprot);
+ _iter14.write(oprot);
}
}
}
@@ -1390,8 +1454,17 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
struct.setCreationTimeIsSet(true);
struct.lastUpdateTime = iprot.readI64();
struct.setLastUpdateTimeIsSet(true);
- struct.taskStatus = new org.apache.airavata.model.status.TaskStatus();
- struct.taskStatus.read(iprot);
+ {
+ org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.taskStatuses = new ArrayList<org.apache.airavata.model.status.TaskStatus>(_list15.size);
+ org.apache.airavata.model.status.TaskStatus _elem16;
+ for (int _i17 = 0; _i17 < _list15.size; ++_i17)
+ {
+ _elem16 = new org.apache.airavata.model.status.TaskStatus();
+ _elem16.read(iprot);
+ struct.taskStatuses.add(_elem16);
+ }
+ }
struct.setTaskStatusIsSet(true);
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
@@ -1403,20 +1476,29 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._
struct.setSubTaskModelIsSet(true);
}
if (incoming.get(2)) {
- struct.taskError = new org.apache.airavata.model.commons.ErrorModel();
- struct.taskError.read(iprot);
+ {
+ org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.taskErrors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list18.size);
+ org.apache.airavata.model.commons.ErrorModel _elem19;
+ for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+ {
+ _elem19 = new org.apache.airavata.model.commons.ErrorModel();
+ _elem19.read(iprot);
+ struct.taskErrors.add(_elem19);
+ }
+ }
struct.setTaskErrorIsSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list5.size);
- org.apache.airavata.model.job.JobModel _elem6;
- for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.jobs = new ArrayList<org.apache.airavata.model.job.JobModel>(_list21.size);
+ org.apache.airavata.model.job.JobModel _elem22;
+ for (int _i23 = 0; _i23 < _list21.size; ++_i23)
{
- _elem6 = new org.apache.airavata.model.job.JobModel();
- _elem6.read(iprot);
- struct.jobs.add(_elem6);
+ _elem22 = new org.apache.airavata.model.job.JobModel();
+ _elem22.read(iprot);
+ struct.jobs.add(_elem22);
}
}
struct.setJobsIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 0015a21..0fc54fe 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -210,9 +210,14 @@ public class GFacUtils {
public static void saveJobStatus(ProcessContext processContext, JobModel jobModel) throws GFacException {
try {
// first we save job jobModel to the registry for sa and then save the job status.
- JobStatus jobStatus = jobModel.getJobStatus();
+ JobStatus jobStatus = null;
+ if(jobModel.getJobStatuses() != null)
+ jobStatus = jobModel.getJobStatuses().get(0);
+
ExperimentCatalog experimentCatalog = processContext.getExperimentCatalog();
- jobModel.setJobStatus(jobStatus);
+ List<JobStatus> statuses = new ArrayList<>();
+ statuses.add(jobStatus);
+ jobModel.setJobStatuses(statuses);
if (jobStatus.getTimeOfStateChange() == 0 || jobStatus.getTimeOfStateChange() > 0 ){
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
}else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 0e8c1f0..8a2cc4e 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -362,8 +362,8 @@ public class ProcessContext {
}
public ProcessState getProcessState() {
- if(processModel.getProcessStatus() != null && processModel.getProcessStatus().size() > 0)
- return processModel.getProcessStatus().get(0).getState();
+ if(processModel.getProcessStatuses() != null && processModel.getProcessStatuses().size() > 0)
+ return processModel.getProcessStatuses().get(0).getState();
else
return null;
}
@@ -374,13 +374,13 @@ public class ProcessContext {
getProcessState().name(), status.getState().name());
List<ProcessStatus> processStatuses = new ArrayList<>();
processStatuses.add(status);
- processModel.setProcessStatus(processStatuses);
+ processModel.setProcessStatuses(processStatuses);
}
}
public ProcessStatus getProcessStatus(){
- if(processModel.getProcessStatus() != null)
- return processModel.getProcessStatus().get(0);
+ if(processModel.getProcessStatuses() != null)
+ return processModel.getProcessStatuses().get(0);
else
return null;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java
index 1a276b3..6f95d3d 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/TaskContext.java
@@ -30,6 +30,9 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+
public class TaskContext {
private static final Logger log = LoggerFactory.getLogger(TaskContext.class);
@@ -64,15 +67,23 @@ public class TaskContext {
log.info("expId: {}, processId: {}, taskId: {}, type: {}:- Task status changed {} -> {}", parentProcessContext
.getExperimentId(), parentProcessContext.getProcessId(), getTaskId(), getTaskType().name(),
getTaskState().name(), taskStatus .getState().name());
- taskModel.setTaskStatus(taskStatus);
+ List<TaskStatus> taskStatuses = new ArrayList<>();
+ taskStatuses.add(taskStatus);
+ taskModel.setTaskStatuses(taskStatuses);
}
public TaskStatus getTaskStatus() {
- return taskModel.getTaskStatus();
+ if(taskModel.getTaskStatuses() != null)
+ return taskModel.getTaskStatuses().get(0);
+ else
+ return null;
}
public TaskState getTaskState() {
- return taskModel.getTaskStatus().getState();
+ if(taskModel.getTaskStatuses() != null)
+ return taskModel.getTaskStatuses().get(0).getState();
+ else
+ return null;
}
public TaskTypes getTaskType() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
index f64e521..90acacc 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
@@ -37,7 +37,6 @@ import org.apache.airavata.gfac.core.monitor.JobMonitor;
import org.apache.airavata.gfac.core.task.JobSubmissionTask;
import org.apache.airavata.gfac.core.task.Task;
import org.apache.airavata.gfac.core.task.TaskException;
-import org.apache.airavata.gfac.impl.task.DataStageTask;
import org.apache.airavata.gfac.impl.task.DataStreamingTask;
import org.apache.airavata.gfac.impl.task.EnvironmentSetupTask;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -53,19 +52,9 @@ import org.apache.airavata.model.commons.ErrorModel;
import org.apache.airavata.model.data.movement.SecurityProtocol;
import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.process.ProcessModel;
-import org.apache.airavata.model.status.JobState;
-import org.apache.airavata.model.status.JobStatus;
-import org.apache.airavata.model.status.ProcessState;
-import org.apache.airavata.model.status.ProcessStatus;
-import org.apache.airavata.model.status.TaskState;
-import org.apache.airavata.model.status.TaskStatus;
+import org.apache.airavata.model.status.*;
import org.apache.airavata.model.task.*;
-import org.apache.airavata.registry.cpi.AppCatalog;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.airavata.registry.cpi.ExpCatChildDataType;
-import org.apache.airavata.registry.cpi.ExperimentCatalog;
-import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
-import org.apache.airavata.registry.cpi.RegistryException;
+import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.utils.ZKPaths;
@@ -339,7 +328,7 @@ public class GFacEngineImpl implements GFacEngine {
executeJobSubmission(taskContext, processContext.isRecovery());
// Don't put any checkpoint in between JobSubmission and Monitoring tasks
- JobStatus jobStatus = processContext.getJobModel().getJobStatus();
+ JobStatus jobStatus = processContext.getJobModel().getJobStatuses().get(0);
if (jobStatus != null && (jobStatus.getJobState() == JobState.SUBMITTED
|| jobStatus.getJobState() == JobState.QUEUED || jobStatus.getJobState() == JobState.ACTIVE)) {
@@ -350,7 +339,7 @@ public class GFacEngineImpl implements GFacEngine {
if (output.isOutputStreaming()){
TaskModel streamingTaskModel = new TaskModel();
streamingTaskModel.setTaskType(TaskTypes.OUTPUT_FETCHING);
- streamingTaskModel.setTaskStatus(new TaskStatus(TaskState.CREATED));
+ streamingTaskModel.setTaskStatuses(Arrays.asList(new TaskStatus(TaskState.CREATED)));
streamingTaskModel.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
streamingTaskModel.setParentProcessId(processContext.getProcessId());
TaskContext streamingTaskContext = getTaskContext(processContext);
@@ -589,7 +578,7 @@ public class GFacEngineImpl implements GFacEngine {
TaskModel taskModel = null;
for (String taskId : taskExecutionOrder) {
taskModel = taskMap.get(taskId);
- TaskState state = taskModel.getTaskStatus().getState();
+ TaskState state = taskModel.getTaskStatuses().get(0).getState();
if (state == TaskState.CREATED || state == TaskState.EXECUTING) {
recoverTaskId = taskId;
break;
@@ -786,7 +775,7 @@ public class GFacEngineImpl implements GFacEngine {
taskModel.setLastUpdateTime(taskModel.getCreationTime());
TaskStatus taskStatus = new TaskStatus(TaskState.CREATED);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- taskModel.setTaskStatus(taskStatus);
+ taskModel.setTaskStatuses(Arrays.asList(taskStatus));
taskModel.setTaskType(TaskTypes.JOB_SUBMISSION);
taskCtx.setTaskModel(taskModel);
return taskCtx;
@@ -803,7 +792,7 @@ public class GFacEngineImpl implements GFacEngine {
taskModel.setLastUpdateTime(taskModel.getCreationTime());
TaskStatus taskStatus = new TaskStatus(TaskState.CREATED);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- taskModel.setTaskStatus(taskStatus);
+ taskModel.setTaskStatuses(Arrays.asList(taskStatus));
taskModel.setTaskType(TaskTypes.DATA_STAGING);
// create data staging sub task model
String remoteOutputDir = processContext.getOutputDir();
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
index 755eed5..df22654 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
import java.util.Map;
public class ArchiveTask implements Task {
@@ -89,7 +90,7 @@ public class ArchiveTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
return status;
}
@@ -159,7 +160,7 @@ public class ArchiveTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
}
return status;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
index 6529395..a4dcb5d 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
@@ -35,7 +35,6 @@ import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.GFacUtils;
import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication;
import org.apache.airavata.gfac.core.cluster.ServerInfo;
import org.apache.airavata.gfac.core.context.ProcessContext;
import org.apache.airavata.gfac.core.context.TaskContext;
@@ -73,6 +72,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -169,7 +169,7 @@ public class BESJobSubmissionTask implements JobSubmissionTask {
log.info("JobID: " + jobId);
jobDetails.setJobId(jobId);
jobDetails.setJobDescription(activityEpr.toString());
- jobDetails.setJobStatus(new JobStatus(JobState.SUBMITTED));
+ jobDetails.setJobStatuses(Arrays.asList(new JobStatus(JobState.SUBMITTED)));
processContext.setJobModel(jobDetails);
GFacUtils.saveJobModel(processContext, jobDetails);
GFacUtils.saveJobStatus(processContext, jobDetails);
@@ -198,7 +198,7 @@ public class BESJobSubmissionTask implements JobSubmissionTask {
log.error(error);
JobState applicationJobStatus = JobState.FAILED;
- jobDetails.setJobStatus(new JobStatus(applicationJobStatus));
+ jobDetails.setJobStatuses(Arrays.asList(new JobStatus(applicationJobStatus)));
sendNotification(processContext, jobDetails);
try {Thread.sleep(5000);} catch (InterruptedException e) {}
@@ -208,7 +208,7 @@ public class BESJobSubmissionTask implements JobSubmissionTask {
} else if (activityStatus.getState() == ActivityStateEnumeration.CANCELLED) {
JobState applicationJobStatus = JobState.CANCELED;
- jobDetails.setJobStatus(new JobStatus(applicationJobStatus));
+ jobDetails.setJobStatuses(Arrays.asList(new JobStatus(applicationJobStatus)));
GFacUtils.saveJobStatus(processContext, jobDetails);
throw new GFacException(
processContext.getExperimentId() + "Job Canceled");
@@ -218,7 +218,7 @@ public class BESJobSubmissionTask implements JobSubmissionTask {
} catch (InterruptedException ignored) {
}
JobState applicationJobStatus = JobState.COMPLETE;
- jobDetails.setJobStatus(new JobStatus(applicationJobStatus));
+ jobDetails.setJobStatuses(Arrays.asList(new JobStatus(applicationJobStatus)));
GFacUtils.saveJobStatus(processContext, jobDetails);
log.info("Job Id: {}, exit code: {}, exit status: {}", jobDetails.getJobId(),
activityStatus.getExitCode(), ActivityStateEnumeration.FINISHED.toString());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
index 69e8d77..8c6a125 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStageTask.java
@@ -20,7 +20,6 @@
*/
package org.apache.airavata.gfac.impl.task;
-import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.context.TaskContext;
import org.apache.airavata.gfac.core.task.Task;
@@ -37,6 +36,7 @@ import org.slf4j.LoggerFactory;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
import java.util.Map;
public class DataStageTask implements Task {
@@ -83,7 +83,7 @@ public class DataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (TException e) {
String msg = "Invalid task invocation";
log.error(msg, e);
@@ -92,7 +92,7 @@ public class DataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (URISyntaxException e) {
String msg = "source or destination is not a valid URI";
log.error(msg, e);
@@ -101,7 +101,7 @@ public class DataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
}
}
return status;
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
index b7f150f..a131ef5 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
@@ -24,7 +24,6 @@ package org.apache.airavata.gfac.impl.task;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.gfac.core.*;
-import org.apache.airavata.gfac.core.cluster.CommandInfo;
import org.apache.airavata.gfac.core.cluster.JobSubmissionOutput;
import org.apache.airavata.gfac.core.cluster.RawCommandInfo;
import org.apache.airavata.gfac.core.cluster.RemoteCluster;
@@ -49,6 +48,9 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.Map;
public class DefaultJobSubmissionTask implements JobSubmissionTask {
@@ -92,8 +94,10 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
if (exitCode != 0 || jobSubmissionOutput.isJobSubmissionFailed()) {
jobModel.setJobId(DEFAULT_JOB_ID);
if (jobSubmissionOutput.isJobSubmissionFailed()) {
- jobModel.setJobStatus(new JobStatus(JobState.FAILED));
- jobModel.getJobStatus().setReason(jobSubmissionOutput.getFailureReason());
+ List<JobStatus> statusList = new ArrayList<>();
+ statusList.add(new JobStatus(JobState.FAILED));
+ statusList.get(0).setReason(jobSubmissionOutput.getFailureReason());
+ jobModel.setJobStatuses(statusList);
GFacUtils.saveJobModel(processContext, jobModel);
log.error("expId: {}, processid: {}, taskId: {} :- Job submission failed for job name {}",
experimentId, taskContext.getProcessId(), taskContext.getTaskId(), jobModel.getJobName());
@@ -150,13 +154,13 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
.getComputeResourceDescription();
jobStatus.setReason("Successfully Submitted to " + computeResourceDescription.getHostName());
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- jobModel.setJobStatus(jobStatus);
+ jobModel.setJobStatuses(Arrays.asList(jobStatus));
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
if (verifyJobSubmissionByJobId(remoteCluster, jobId)) {
jobStatus.setJobState(JobState.QUEUED);
jobStatus.setReason("Verification step succeeded");
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- jobModel.setJobStatus(jobStatus);
+ jobModel.setJobStatuses(Arrays.asList(jobStatus));
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
}
// doing gateway reporting
@@ -184,7 +188,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
jobStatus.setJobState(JobState.QUEUED);
jobStatus.setReason("Verification step succeeded");
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- jobModel.setJobStatus(jobStatus);
+ jobModel.setJobStatuses(Arrays.asList(jobStatus));
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
taskStatus.setState(TaskState.COMPLETED);
taskStatus.setReason("Submitted job to compute resource");
@@ -233,7 +237,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (ApplicationSettingsException | GFacException e) {
String msg = "Error occurred while creating job descriptor";
log.error(msg, e);
@@ -243,7 +247,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (SSHApiException e) {
String msg = "Error occurred while submitting the job";
log.error(msg, e);
@@ -253,7 +257,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (IOException e) {
String msg = "Error while reading the content of the job file";
log.error(msg, e);
@@ -263,7 +267,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (InterruptedException e) {
String msg = "Error occurred while verifying the job submission";
log.error(msg, e);
@@ -273,7 +277,7 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (RegistryException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/EnvironmentSetupTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/EnvironmentSetupTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/EnvironmentSetupTask.java
index 1256e48..7de0282 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/EnvironmentSetupTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/EnvironmentSetupTask.java
@@ -32,6 +32,7 @@ import org.apache.airavata.model.task.TaskTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
import java.util.Map;
public class EnvironmentSetupTask implements Task {
@@ -57,7 +58,7 @@ public class EnvironmentSetupTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
}
return status;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java
index 59a36e1..b57b68d 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ForkJobSubmissionTask.java
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Map;
public class ForkJobSubmissionTask implements JobSubmissionTask {
@@ -87,7 +88,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
jobStatus.setReason("Successfully Submitted to " + taskContext.getParentProcessContext()
.getComputeResourceDescription().getHostName());
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- jobModel.setJobStatus(jobStatus);
+ jobModel.setJobStatuses(Arrays.asList(jobStatus));
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
taskStatus = new TaskStatus(TaskState.COMPLETED);
taskStatus.setReason("Submitted job to compute resource");
@@ -124,7 +125,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (AppCatalogException e) {
String msg = "Error while instantiating app catalog";
log.error(msg, e);
@@ -133,7 +134,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (GFacException e) {
String msg = "Error occurred while creating job descriptor";
log.error(msg, e);
@@ -142,7 +143,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (SSHApiException e) {
String msg = "Error occurred while submitting the job";
log.error(msg, e);
@@ -151,7 +152,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (IOException e) {
String msg = "Error while reading the content of the job file";
log.error(msg, e);
@@ -160,7 +161,7 @@ public class ForkJobSubmissionTask implements JobSubmissionTask {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
}
return taskStatus;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index 904d486..6a8800e 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -24,7 +24,6 @@ import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.GFacUtils;
import org.apache.airavata.gfac.core.SSHApiException;
@@ -57,6 +56,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Arrays;
import java.util.Map;
/**
@@ -179,7 +179,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
return status;
} catch (ApplicationSettingsException | FileNotFoundException e) {
String msg = "Failed while reading credentials";
@@ -189,7 +189,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (URISyntaxException e) {
String msg = "Source or destination uri is not correct source : " + subTaskModel.getSource() + ", " +
"destination : " + subTaskModel.getDestination();
@@ -199,7 +199,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (SSHApiException e) {
String msg = e.getMessage();
log.error(msg, e);
@@ -208,7 +208,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (AiravataException e) {
String msg = "Error while creating ssh session with client";
log.error(msg, e);
@@ -217,7 +217,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (JSchException | IOException e) {
String msg = "Failed to do scp with client";
log.error(msg, e);
@@ -226,7 +226,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
} catch (GFacException e) {
String msg = "Failed update experiment and process inputs and outputs";
log.error(msg, e);
@@ -235,7 +235,7 @@ public class SCPDataStageTask implements Task {
ErrorModel errorModel = new ErrorModel();
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
- taskContext.getTaskModel().setTaskError(errorModel);
+ taskContext.getTaskModel().setTaskErrors(Arrays.asList(errorModel));
}
return status;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java
index 76b678a..375e570 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/StreamData.java
@@ -24,15 +24,11 @@ package org.apache.airavata.gfac.impl.task.utils;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import org.apache.airavata.common.exception.AiravataException;
-import org.apache.airavata.credential.store.credential.Credential;
-import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential;
-import org.apache.airavata.credential.store.store.CredentialReader;
import org.apache.airavata.credential.store.store.CredentialStoreException;
import org.apache.airavata.gfac.core.GFacException;
import org.apache.airavata.gfac.core.GFacUtils;
import org.apache.airavata.gfac.core.SSHApiException;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication;
import org.apache.airavata.gfac.core.cluster.CommandInfo;
import org.apache.airavata.gfac.core.cluster.RawCommandInfo;
import org.apache.airavata.gfac.core.cluster.RemoteCluster;
@@ -40,7 +36,6 @@ import org.apache.airavata.gfac.core.cluster.ServerInfo;
import org.apache.airavata.gfac.core.context.TaskContext;
import org.apache.airavata.gfac.impl.Factory;
import org.apache.airavata.gfac.impl.SSHUtils;
-import org.apache.airavata.model.commons.ErrorModel;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.model.status.JobStatus;
import org.apache.airavata.model.task.DataStagingTaskModel;
@@ -48,7 +43,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -78,7 +72,7 @@ public class StreamData extends TimerTask {
public void run() {
try {
// output staging should start when the job is in active state
- JobStatus jobStatus = taskContext.getParentProcessContext().getJobModel().getJobStatus();
+ JobStatus jobStatus = taskContext.getParentProcessContext().getJobModel().getJobStatuses().get(0);
if (jobStatus != null && jobStatus.getJobState().equals(JobState.ACTIVE)){
runOutputStaging();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index b2df00b..b24aa75 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@ -135,7 +135,7 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{
newJobStatus.setReason("Moving job status to cancel, as we didn't see any email from this job " +
"for a while after execute job cancel command. This may happen if job was in queued state " +
"when we run the cancel command");
- jobModel.setJobStatus(newJobStatus);
+ jobModel.setJobStatuses(Arrays.asList(newJobStatus));
GFacUtils.saveJobStatus(pc, jobModel);
}
ProcessStatus pStatus = new ProcessStatus(ProcessState.CANCELLING);
@@ -374,7 +374,7 @@ public class EmailBasedMonitor implements JobMonitor, Runnable{
}
if (jobStatus.getJobState() != null) {
try {
- jobModel.setJobStatus(jobStatus);
+ jobModel.setJobStatuses(Arrays.asList(jobStatus));
log.info("[EJM]: Publishing status changes to amqp. " + jobDetails);
GFacUtils.saveJobStatus(parentProcessContext, jobModel);
} catch (GFacException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index 73a6aef..b1218e4 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -217,7 +217,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
// FIXME
// List<JobDetails> jobDetailsList = task.getJobDetailsList();
// for(JobDetails jobDetails:jobDetailsList) {
-// JobState jobState = jobDetails.getJobStatus().getJobState();
+// JobState jobState = jobDetails.getJobStatuses().getJobState();
// if (jobState.getValue() > 4){
// logger.error("Cannot cancel the job, because current job state is : " + jobState.toString() +
// "jobId: " + jobDetails.getJobID() + " Job Name: " + jobDetails.getJobName());
@@ -346,7 +346,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
List<String> envTaskIds = new ArrayList<>();
TaskModel envSetupTask = new TaskModel();
envSetupTask.setTaskType(TaskTypes.ENV_SETUP);
- envSetupTask.setTaskStatus(new TaskStatus(TaskState.CREATED));
+ envSetupTask.setTaskStatuses(Arrays.asList(new TaskStatus(TaskState.CREATED)));
envSetupTask.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
envSetupTask.setParentProcessId(processModel.getProcessId());
EnvironmentSetupTaskModel envSetupSubModel = new EnvironmentSetupTaskModel();
@@ -487,7 +487,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
taskModel.setLastUpdateTime(taskModel.getCreationTime());
TaskStatus taskStatus = new TaskStatus(TaskState.CREATED);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- taskModel.setTaskStatus(taskStatus);
+ taskModel.setTaskStatuses(Arrays.asList(taskStatus));
taskModel.setTaskType(TaskTypes.JOB_SUBMISSION);
JobSubmissionTaskModel submissionSubTask = new JobSubmissionTaskModel();
submissionSubTask.setMonitorMode(monitorMode);
@@ -508,7 +508,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
monitorTaskModel.setLastUpdateTime(monitorTaskModel.getCreationTime());
TaskStatus monitorTaskStatus = new TaskStatus(TaskState.CREATED);
monitorTaskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- monitorTaskModel.setTaskStatus(monitorTaskStatus);
+ monitorTaskModel.setTaskStatuses(Arrays.asList(monitorTaskStatus));
monitorTaskModel.setTaskType(TaskTypes.MONITORING);
MonitorTaskModel monitorSubTaskModel = new MonitorTaskModel();
monitorSubTaskModel.setMonitorMode(monitorMode);
@@ -538,7 +538,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
taskModel.setLastUpdateTime(taskModel.getCreationTime());
TaskStatus taskStatus = new TaskStatus(TaskState.CREATED);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- taskModel.setTaskStatus(taskStatus);
+ taskModel.setTaskStatuses(Arrays.asList(taskStatus));
taskModel.setTaskType(TaskTypes.DATA_STAGING);
// create data staging sub task model
DataStagingTaskModel submodel = new DataStagingTaskModel();
@@ -576,7 +576,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
taskModel.setLastUpdateTime(taskModel.getCreationTime());
TaskStatus taskStatus = new TaskStatus(TaskState.CREATED);
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
- taskModel.setTaskStatus(taskStatus);
+ taskModel.setTaskStatuses(Arrays.asList(taskStatus));
taskModel.setTaskType(TaskTypes.DATA_STAGING);
ComputeResourcePreference computeResourcePreference = OrchestratorUtils.getComputeResourcePreference(orchestratorContext, processModel, gatewayId);
ComputeResourceDescription computeResource = orchestratorContext.getRegistry().getAppCatalog().getComputeResource().getComputeResource(processModel.getComputeResourceId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
index a66295e..763f5da 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -38,7 +38,7 @@ public class JobEntity {
private String stdErr;
private int exitCode;
- private List<JobStatusEntity> jobStatus;
+ private List<JobStatusEntity> jobStatuses;
private TaskEntity task;
@@ -145,12 +145,12 @@ public class JobEntity {
}
@OneToMany(targetEntity = JobStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "job")
- public List<JobStatusEntity> getJobStatus() {
- return jobStatus;
+ public List<JobStatusEntity> getJobStatuses() {
+ return jobStatuses;
}
- public void setJobStatus(List<JobStatusEntity> jobStatus) {
- this.jobStatus = jobStatus;
+ public void setJobStatuses(List<JobStatusEntity> jobStatus) {
+ this.jobStatuses = jobStatus;
}
@ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index 109041e..a379ef6 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -45,8 +45,8 @@ public class ProcessEntity {
private String experimentDataDir;
private String userName;
- private List<ProcessStatusEntity> processStatus;
- private List<ProcessErrorEntity> processError;
+ private List<ProcessStatusEntity> processStatuses;
+ private List<ProcessErrorEntity> processErrors;
private List<ProcessInputEntity> processInputs;
private List<ProcessOutputEntity> processOutputs;
private ProcessResourceSchedulingEntity processResourceSchedule;
@@ -211,21 +211,21 @@ public class ProcessEntity {
}
@OneToMany(targetEntity = ProcessStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
- public List<ProcessStatusEntity> getProcessStatus() {
- return processStatus;
+ public List<ProcessStatusEntity> getProcessStatuses() {
+ return processStatuses;
}
- public void setProcessStatus(List<ProcessStatusEntity> processStatus) {
- this.processStatus = processStatus;
+ public void setProcessStatuses(List<ProcessStatusEntity> processStatus) {
+ this.processStatuses = processStatus;
}
@OneToMany(targetEntity = ProcessErrorEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
- public List<ProcessErrorEntity> getProcessError() {
- return processError;
+ public List<ProcessErrorEntity> getProcessErrors() {
+ return processErrors;
}
- public void setProcessError(List<ProcessErrorEntity> processError) {
- this.processError = processError;
+ public void setProcessErrors(List<ProcessErrorEntity> processError) {
+ this.processErrors = processError;
}
@OneToMany(targetEntity = ProcessInputEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
index f01fa10..8e4be82 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -37,8 +37,8 @@ public class TaskEntity {
private String taskDetail;
private ByteBuffer subTaskModel;
- private List<TaskStatusEntity> taskStatus;
- private List<TaskErrorEntity> taskError;
+ private List<TaskStatusEntity> taskStatuses;
+ private List<TaskErrorEntity> taskErrors;
private List<JobEntity> jobs;
private ProcessEntity process;
@@ -109,21 +109,21 @@ public class TaskEntity {
}
@OneToMany(targetEntity = TaskStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
- public List<TaskStatusEntity> getTaskStatus() {
- return taskStatus;
+ public List<TaskStatusEntity> getTaskStatuses() {
+ return taskStatuses;
}
- public void setTaskStatus(List<TaskStatusEntity> taskStatus) {
- this.taskStatus = taskStatus;
+ public void setTaskStatuses(List<TaskStatusEntity> taskStatus) {
+ this.taskStatuses = taskStatus;
}
@OneToMany(targetEntity = TaskErrorEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
- public List<TaskErrorEntity> getTaskError() {
- return taskError;
+ public List<TaskErrorEntity> getTaskErrors() {
+ return taskErrors;
}
- public void setTaskError(List<TaskErrorEntity> taskError) {
- this.taskError = taskError;
+ public void setTaskErrors(List<TaskErrorEntity> taskError) {
+ this.taskErrors = taskError;
}
@OneToMany(targetEntity = JobEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
index d30b1de..a79a462 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -73,10 +73,10 @@ public class ExperimentRepository extends AbstractRepository<ExperimentModel, Ex
process.getProcessInputs().forEach(proInput->proInput.setProceseId(processId));
if(process.getProcessOutputs() != null)
process.getProcessOutputs().forEach(proOutput->proOutput.setProcessId(processId));
- if(process.getProcessError() != null)
- process.getProcessError().forEach(processErr->processErr.setProcessId(processId));
- if(process.getProcessStatus() != null)
- process.getProcessStatus().forEach(processStat->processStat.setProcessId(processId));
+ if(process.getProcessErrors() != null)
+ process.getProcessErrors().forEach(processErr->processErr.setProcessId(processId));
+ if(process.getProcessStatuses() != null)
+ process.getProcessStatuses().forEach(processStat->processStat.setProcessId(processId));
if(process.getTasks() != null){
process.getTasks().forEach(task->{
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/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 f66b283..8465af4 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
@@ -309,8 +309,8 @@ public class ExperimentRegistry {
processStatuses.add(processStatus);
addProcessStatus(processStatuses.get(0), process.getProcessId());
- if(process.getProcessError() != null) {
- addProcessError(process.getProcessError().get(0), process.getProcessId());
+ if(process.getProcessErrors() != null) {
+ addProcessError(process.getProcessErrors().get(0), process.getProcessId());
}
} catch (Exception e) {
logger.error(expId, "Error while adding process...", e);
@@ -463,8 +463,8 @@ public class ExperimentRegistry {
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
addTaskStatus(taskStatus, task.getTaskId());
- if(task.getTaskError() != null) {
- addTaskError(task.getTaskError(), task.getTaskId());
+ if(task.getTaskErrors() != null) {
+ addTaskError(task.getTaskErrors().get(0), task.getTaskId());
}
} catch (Exception e) {
logger.error(processID, "Error while adding task...", e);
@@ -763,11 +763,11 @@ public class ExperimentRegistry {
if(process.getProcessOutputs() != null && process.getProcessOutputs().size() > 0) {
updateProcessOutputs(process.getProcessOutputs(), process.getProcessId());
}
- if(process.getProcessStatus() != null) {
- updateProcessStatus(process.getProcessStatus().get(0), process.getProcessId());
+ if(process.getProcessStatuses() != null) {
+ updateProcessStatus(process.getProcessStatuses().get(0), process.getProcessId());
}
- if(process.getProcessError() != null) {
- updateProcessError(process.getProcessError().get(0), process.getProcessId());
+ if(process.getProcessErrors() != null) {
+ updateProcessError(process.getProcessErrors().get(0), process.getProcessId());
}
if(process.getTasks() != null && process.getTasks().size() > 0){
for(TaskModel task : process.getTasks()){
@@ -883,11 +883,11 @@ public class ExperimentRegistry {
taskResource.setSubTaskModel(task.getSubTaskModel());
taskResource.save();
- if(task.getTaskError() != null) {
- updateTaskError(task.getTaskError(), task.getTaskId());
+ if(task.getTaskErrors() != null) {
+ updateTaskError(task.getTaskErrors().get(0), task.getTaskId());
}
- if(task.getTaskError() != null) {
- updateTaskError(task.getTaskError(), task.getTaskId());
+ if(task.getTaskErrors() != null) {
+ updateTaskError(task.getTaskErrors().get(0), task.getTaskId());
}
} catch (Exception e) {
logger.error(taskID, "Error while adding task...", e);
@@ -1252,7 +1252,9 @@ public class ExperimentRegistry {
if (latestSR != null) {
JobStatus jobStatus = new JobStatus(JobState.valueOf(latestSR.getState()));
jobStatus.setReason(latestSR.getReason());
- jobModel.setJobStatus(jobStatus);
+ List<JobStatus> statuses = new ArrayList<>();
+ statuses.add(jobStatus);
+ jobModel.setJobStatuses(statuses);
}
jobs.add(jobModel);
}
@@ -1267,7 +1269,9 @@ public class ExperimentRegistry {
if (latestSR != null) {
JobStatus jobStatus = new JobStatus(JobState.valueOf(latestSR.getState()));
jobStatus.setReason(latestSR.getReason());
- jobModel.setJobStatus(jobStatus);
+ List<JobStatus> statuses = new ArrayList<>();
+ statuses.add(jobStatus);
+ jobModel.setJobStatuses(statuses);
}
jobs.add(jobModel);
}
[03/10] airavata git commit: adding process model classes
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java
new file mode 100644
index 0000000..e7cc6ee
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorPK.java
@@ -0,0 +1,75 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ProcessErrorPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ProcessErrorPK.class);
+ private String errorId;
+ private String processId;
+
+ @Column(name = "ERROR_ID")
+ @Id
+ public String getErrorId() {
+ return errorId;
+ }
+
+ public void setErrorId(String errorId) {
+ this.errorId = errorId;
+ }
+
+ @Column(name = "PROCESS_ID")
+ @Id
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ProcessErrorPK that = (ProcessErrorPK) o;
+
+ if (getErrorId() != null ? !getErrorId().equals(that.getErrorId()) : that.getErrorId() != null) return false;
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getErrorId() != null ? getErrorId().hashCode() : 0;
+ result = 31 * result + (getProcessId() != null ? getProcessId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
new file mode 100644
index 0000000..a63ff37
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -0,0 +1,174 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "PROCESS_INPUT")
+@IdClass(ProcessInputPK.class)
+public class ProcessInputEntity {
+ private String processId;
+ public String name;
+ public String value;
+ public String type;
+ public String applicationArgument;
+ public boolean standardInput;
+ public String userFriendlyDescription;
+ public String metaData;
+ public int inputOrder;
+ public boolean isRequired;
+ public boolean requiredToAddedToCommandLine;
+ public boolean dataStaged;
+ public String storageResourceId;
+
+ private ProcessEntity process;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProceesId() {
+ return processId;
+ }
+
+ public void setProceseId(String processId) {
+ this.processId = processId;
+ }
+
+ @Id
+ @Column(name = "INPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(name = "INPUT_VALUE")
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Column(name = "INPUT_TYPE")
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Column(name = "APPLICATION_ARGUMENT")
+ public String getApplicationArgument() {
+ return applicationArgument;
+ }
+
+ public void setApplicationArgument(String applicationArgument) {
+ this.applicationArgument = applicationArgument;
+ }
+
+ @Column(name = "STANDARD_INPUT")
+ public boolean isStandardInput() {
+ return standardInput;
+ }
+
+ public void setStandardInput(boolean standardInput) {
+ this.standardInput = standardInput;
+ }
+
+ @Column(name = "USER_FRIENDLY_DESCRIPTION")
+ public String getUserFriendlyDescription() {
+ return userFriendlyDescription;
+ }
+
+ public void setUserFriendlyDescription(String userFriendlyDescription) {
+ this.userFriendlyDescription = userFriendlyDescription;
+ }
+
+ @Lob
+ @Column(name = "METADATA")
+ public String getMetaData() {
+ return metaData;
+ }
+
+ public void setMetaData(String metaData) {
+ this.metaData = metaData;
+ }
+
+ @Column(name = "INPUT_ORDER")
+ public int getInputOrder() {
+ return inputOrder;
+ }
+
+ public void setInputOrder(int inputOrder) {
+ this.inputOrder = inputOrder;
+ }
+
+ @Column(name = "REQUIRED")
+ public boolean isRequired() {
+ return isRequired;
+ }
+
+ public void setRequired(boolean isRequired) {
+ this.isRequired = isRequired;
+ }
+
+ @Column(name = "REQUIRED_TO_ADDED_TO_COMMANDLINE")
+ public boolean isRequiredToAddedToCommandLine() {
+ return requiredToAddedToCommandLine;
+ }
+
+ public void setRequiredToAddedToCommandLine(boolean requiredToAddedToCommandLine) {
+ this.requiredToAddedToCommandLine = requiredToAddedToCommandLine;
+ }
+
+ @Column(name = "DATA_STAGED")
+ public boolean isDataStaged() {
+ return dataStaged;
+ }
+
+ public void setDataStaged(boolean dataStaged) {
+ this.dataStaged = dataStaged;
+ }
+
+ @Column(name = "STORAGE_RESOURCE_ID")
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ @ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.java
new file mode 100644
index 0000000..188b35f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ProcessInputPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ProcessInputPK.class);
+ private String processId;
+ private String name;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Id
+ @Column(name = "INPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ProcessInputPK that = (ProcessInputPK) o;
+
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getProcessId() != null ? getProcessId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
new file mode 100644
index 0000000..06181bc
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -0,0 +1,165 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "PROCESS_OUTPUT")
+@IdClass(ProcessOutputPK.class)
+public class ProcessOutputEntity {
+ private String processId;
+ public String name;
+ public String value;
+ public String type;
+ public String applicationArgument;
+ public boolean isRequired;
+ public boolean requiredToAddedToCommandLine;
+ public boolean dataMovement;
+ public String location;
+ public String searchQuery;
+ public boolean outputStreaming;
+ public String storageResourceId;
+
+ private ProcessEntity process;
+
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Id
+ @Column(name = "OUTPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Column(name = "OUTPUT_VALUE")
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Column(name = "OUTPUT_TYPE")
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Column(name = "APPLICATION_ARGUMENT")
+ public String getApplicationArgument() {
+ return applicationArgument;
+ }
+
+ public void setApplicationArgument(String applicationArgument) {
+ this.applicationArgument = applicationArgument;
+ }
+
+ @Column(name = "REQUIRED")
+ public boolean isRequired() {
+ return isRequired;
+ }
+
+ public void setRequired(boolean isRequired) {
+ this.isRequired = isRequired;
+ }
+
+
+ @Column(name = "REQUIRED_TO_ADDED_TO_COMMANDLINE")
+ public boolean isRequiredToAddedToCommandLine() {
+ return requiredToAddedToCommandLine;
+ }
+
+ public void setRequiredToAddedToCommandLine(boolean requiredToAddedToCommandLine) {
+ this.requiredToAddedToCommandLine = requiredToAddedToCommandLine;
+ }
+
+ @Column(name = "DATA_MOVEMENT")
+ public boolean isDataMovement() {
+ return dataMovement;
+ }
+
+ public void setDataMovement(boolean dataMovement) {
+ this.dataMovement = dataMovement;
+ }
+
+ @Column(name = "LOCATION")
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ @Column(name = "SEARCH_QUERY")
+ public String getSearchQuery() {
+ return searchQuery;
+ }
+
+ public void setSearchQuery(String searchQuery) {
+ this.searchQuery = searchQuery;
+ }
+
+ @Column(name = "OUTPUT_STREAMING")
+ public boolean isOutputStreaming() {
+ return outputStreaming;
+ }
+
+ public void setOutputStreaming(boolean outputStreaming) {
+ this.outputStreaming = outputStreaming;
+ }
+
+ @Column(name = "STORAGE_RESOURCE_ID")
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ @ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java
new file mode 100644
index 0000000..bde7c50
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputPK.java
@@ -0,0 +1,70 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ProcessOutputPK implements Serializable {
+ private String processId;
+ private String name;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Id
+ @Column(name = "OUTPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ProcessOutputPK that = (ProcessOutputPK) o;
+
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getProcessId() != null ? getProcessId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
new file mode 100644
index 0000000..11f167d
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
@@ -0,0 +1,170 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "PROCESS_RESOURCE_SCHEDULING")
+public class ProcessResourceSchedulingEntity {
+ private String processId;
+ private String resourceHostId;
+ private int totalCPUCount;
+ private int nodeCount;
+ private int numberOfThreads;
+ private String queueName;
+ private int wallTimeLimit;
+ private int totalPhysicalMemory;
+ private String chessisNumber;
+ private String staticWorkingDir;
+ private String overrideLoginUserName;
+ private String overrideScratchLocation;
+ private String overrideAllocationProjectNumber;
+ private ProcessEntity process;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Column(name = "RESOURCE_HOST_ID")
+ public String getResourceHostId() {
+ return resourceHostId;
+ }
+
+ public void setResourceHostId(String resourceHostId) {
+ this.resourceHostId = resourceHostId;
+ }
+
+ @Column(name = "CPU_COUNT")
+ public int getTotalCPUCount() {
+ return totalCPUCount;
+ }
+
+ public void setTotalCPUCount(int totalCPUCount) {
+ this.totalCPUCount = totalCPUCount;
+ }
+
+ @Column(name = "NODE_COUNT")
+ public int getNodeCount() {
+ return nodeCount;
+ }
+
+ public void setNodeCount(int nodeCount) {
+ this.nodeCount = nodeCount;
+ }
+
+ @Column(name = "NUMBER_OF_THREADS")
+ public int getNumberOfThreads() {
+ return numberOfThreads;
+ }
+
+ public void setNumberOfThreads(int numberOfThreads) {
+ this.numberOfThreads = numberOfThreads;
+ }
+
+ @Column(name = "QUEUE_NAME")
+ public String getQueueName() {
+ return queueName;
+ }
+
+ public void setQueueName(String queueName) {
+ this.queueName = queueName;
+ }
+
+ @Column(name = "WALL_TIME_LIMIT")
+ public int getWallTimeLimit() {
+ return wallTimeLimit;
+ }
+
+ public void setWallTimeLimit(int wallTimeLimit) {
+ this.wallTimeLimit = wallTimeLimit;
+ }
+
+ @Column(name = "TOTAL_PHYSICAL_MEMORY")
+ public int getTotalPhysicalMemory() {
+ return totalPhysicalMemory;
+ }
+
+ public void setTotalPhysicalMemory(int totalPhysicalMemory) {
+ this.totalPhysicalMemory = totalPhysicalMemory;
+ }
+
+ @Column(name = "CHESSIS_NUMBER")
+ public String getChessisNumber() {
+ return chessisNumber;
+ }
+
+ public void setChessisNumber(String chessisNumber) {
+ this.chessisNumber = chessisNumber;
+ }
+
+ @Column(name = "STATIC_WORKING_DIRECTORY")
+ public String getStaticWorkingDir() {
+ return staticWorkingDir;
+ }
+
+ public void setStaticWorkingDir(String staticWorkingDir) {
+ this.staticWorkingDir = staticWorkingDir;
+ }
+
+ @Column(name = "OVERRIDE_LOGIN_USERNAME")
+ public String getOverrideLoginUserName() {
+ return overrideLoginUserName;
+ }
+
+ public void setOverrideLoginUserName(String overrideLoginUserName) {
+ this.overrideLoginUserName = overrideLoginUserName;
+ }
+
+ @Column(name = "OVERRIDE_SCRATCH_LOCATION")
+ public String getOverrideScratchLocation() {
+ return overrideScratchLocation;
+ }
+
+ public void setOverrideScratchLocation(String overrideScratchLocation) {
+ this.overrideScratchLocation = overrideScratchLocation;
+ }
+
+ @Column(name = "OVERRIDE_ALLOCATION_PROJECT_NUMBER")
+ public String getOverrideAllocationProjectNumber() {
+ return overrideAllocationProjectNumber;
+ }
+
+ public void setOverrideAllocationProjectNumber(String overrideAllocationProjectNumber) {
+ this.overrideAllocationProjectNumber = overrideAllocationProjectNumber;
+ }
+
+ @OneToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL)
+ @PrimaryKeyJoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
new file mode 100644
index 0000000..ea816b5
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "PROCESS_STATUS")
+@IdClass(ProcessStatusPK.class)
+public class ProcessStatusEntity {
+ private String processId;
+ private String state;
+ private long timeOfStateChange;
+ private String reason;
+
+ private ProcessEntity process;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Id
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Column(name = "TIME_OF_STATE_CHANGE")
+ public long getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(long timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ @ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.java
new file mode 100644
index 0000000..dba568a
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ProcessStatusPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ProcessStatusPK.class);
+ private String state;
+ private String processId;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ProcessStatusPK that = (ProcessStatusPK) o;
+
+ if (getState() != null ? !getState().equals(that.getState()) : that.getState() != null) return false;
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getState() != null ? getState().hashCode() : 0;
+ result = 31 * result + (getProcessId() != null ? getProcessId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
index b20650d..5a52dff 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -49,8 +49,11 @@ public class ExperimentRepository extends AbstractRepository<ExperimentModel, Ex
Mapper mapper = ObjectMapperSingleton.getInstance();
ExperimentEntity entity = mapper.map(experiment, ExperimentEntity.class);
- if(entity.getUserConfigurationData() != null)
+ if(entity.getUserConfigurationData() != null) {
entity.getUserConfigurationData().setExperimentId(experimentId);
+ if (entity.getUserConfigurationData().getComputeResourceSchedulingEntity() != null)
+ entity.getUserConfigurationData().getComputeResourceSchedulingEntity().setExperimentId(experimentId);
+ }
if(entity.getExperimentInputs() != null)
entity.getExperimentInputs().forEach(expIn->expIn.setExperimentId(experimentId));
if(entity.getExperimentOutputs() != null)
@@ -60,6 +63,23 @@ public class ExperimentRepository extends AbstractRepository<ExperimentModel, Ex
if(entity.getExperimentStatuses() != null)
entity.getExperimentStatuses().forEach(expStatus->expStatus.setExperimentId(experimentId));
+ if(entity.getProcesses() != null){
+ entity.getProcesses().forEach(process->{
+ process.setExperimentId(experimentId);
+ String processId = process.getProcessId();
+ if(process.getProcessResourceSchedule() != null)
+ process.getProcessResourceSchedule().setProcessId(processId);
+ if(process.getProcessInputs() != null)
+ process.getProcessInputs().forEach(proInput->proInput.setProceseId(processId));
+ if(process.getProcessOutputs() != null)
+ process.getProcessOutputs().forEach(proOutput->proOutput.setProcessId(processId));
+ if(process.getProcessError() != null)
+ process.getProcessError().forEach(processErr->processErr.setProcessId(processId));
+ if(process.getProcessStatus() != null)
+ process.getProcessStatus().forEach(processStat->processStat.setProcessId(processId));
+ });
+ }
+
ExperimentEntity persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity));
return mapper.map(persistedCopy, ExperimentModel.class);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
index f7d72f3..8367f97 100644
--- a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
@@ -34,6 +34,12 @@
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentOutputEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentStatusEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.UserConfigurationEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessErrorEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessInputEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessOutputEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessResourceSchedulingEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ProcessStatusEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
index 4d401a3..8c11027 100644
--- a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
+++ b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
@@ -116,4 +116,112 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_STATUS(
REASON VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID, STATE),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS(
+ PROCESS_ID VARCHAR (255),
+ EXPERIMENT_ID VARCHAR (255),
+ CREATION_TIME BIGINT,
+ LAST_UPDATE_TIME BIGINT,
+ PROCESS_DETAIL VARCHAR (255),
+ APPLICATION_INTERFACE_ID VARCHAR (255),
+ APPLICATION_DEPLOYMENT_ID VARCHAR (255),
+ COMPUTE_RESOURCE_ID VARCHAR (255),
+ TASK_DAG VARCHAR (255),
+ GATEWAY_EXECUTION_ID VARCHAR (255),
+ ENABLE_EMAIL_NOTIFICATION TINYINT(1),
+ STORAGE_RESOURCE_ID VARCHAR (255),
+ USER_DN VARCHAR (255),
+ GENERATE_CERT VARCHAR (255),
+ EXPERIMENT_DATA_DIR VARCHAR (255),
+ USER_NAME VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_EMAIL (
+ PROCESS_ID VARCHAR (255),
+ EMAIL VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID, EMAIL),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_RESOURCE_SCHEDULING(
+ PROCESS_ID VARCHAR (255),
+ RESOURCE_HOST_ID VARCHAR (255),
+ CPU_COUNT INT,
+ NODE_COUNT INT,
+ NUMBER_OF_THREADS INT,
+ QUEUE_NAME VARCHAR (255),
+ WALL_TIME_LIMIT INT,
+ TOTAL_PHYSICAL_MEMORY INT,
+ CHESSIS_NUMBER VARCHAR (255),
+ STATIC_WORKING_DIRECTORY VARCHAR (255),
+ OVERRIDE_LOGIN_USERNAME VARCHAR (255),
+ OVERRIDE_SCRATCH_LOCATION VARCHAR (255),
+ OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_INPUT(
+ PROCESS_ID VARCHAR (255),
+ INPUT_NAME VARCHAR (255),
+ INPUT_VALUE VARCHAR (255),
+ INPUT_TYPE VARCHAR (255),
+ APPLICATION_ARGUMENT VARCHAR (255),
+ STANDARD_INPUT TINYINT(1),
+ USER_FRIENDLY_DESCRIPTION VARCHAR (255),
+ METADATA VARCHAR (4096),
+ INPUT_ORDER INT,
+ REQUIRED TINYINT(1),
+ REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT(1),
+ DATA_STAGED TINYINT(1),
+ STORAGE_RESOURCE_ID VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID,INPUT_NAME),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_OUTPUT(
+ PROCESS_ID VARCHAR (255),
+ OUTPUT_NAME VARCHAR (255),
+ OUTPUT_VALUE VARCHAR (255),
+ OUTPUT_TYPE VARCHAR (255),
+ APPLICATION_ARGUMENT VARCHAR (255),
+ REQUIRED TINYINT(1),
+ REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT(1),
+ DATA_MOVEMENT TINYINT(1),
+ LOCATION VARCHAR (255),
+ SEARCH_QUERY VARCHAR (255),
+ OUTPUT_STREAMING TINYINT(1),
+ STORAGE_RESOURCE_ID VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID,OUTPUT_NAME),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_ERROR(
+ ERROR_ID VARCHAR (255),
+ PROCESS_ID VARCHAR (255),
+ CREATION_TIME BIGINT,
+ ACTUAL_ERROR_MESSAGE VARCHAR (255),
+ USER_FRIENDLY_MESSAGE VARCHAR (255),
+ TRANSIENT_OR_PERSISTENT TINYINT,
+ PRIMARY KEY (ERROR_ID, PROCESS_ID),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_ERROR_ROOT_CAUSE_ERROR_ID(
+ ERROR_ID VARCHAR (255),
+ ROOT_CAUSE_ERROR_ID VARCHAR (255),
+ PRIMARY KEY (ERROR_ID, ROOT_CAUSE_ERROR_ID),
+ FOREIGN KEY(ERROR_ID) REFERENCES PROCESS_ERROR(ERROR_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS PROCESS_STATUS(
+ PROCESS_ID VARCHAR (255),
+ STATE VARCHAR (255),
+ TIME_OF_STATE_CHANGE BIGINT,
+ REASON VARCHAR (255),
+ PRIMARY KEY (PROCESS_ID, STATE),
+ FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/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 3066886..f66b283 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
@@ -293,8 +293,8 @@ public class ExperimentRegistry {
processResource.save();
- if(process.getResourceSchedule() != null) {
- addProcessResourceSchedule(process.getResourceSchedule(), process.getProcessId());
+ if(process.getProcessResourceSchedule() != null) {
+ addProcessResourceSchedule(process.getProcessResourceSchedule(), process.getProcessId());
}
if(process.getProcessInputs() != null && process.getProcessInputs().size() > 0) {
addProcessInputs(process.getProcessInputs(), process.getProcessId());
@@ -305,10 +305,12 @@ public class ExperimentRegistry {
ProcessStatus processStatus = new ProcessStatus();
processStatus.setState(ProcessState.CREATED);
- addProcessStatus(processStatus, process.getProcessId());
+ List<ProcessStatus> processStatuses = new ArrayList<>();
+ processStatuses.add(processStatus);
+ addProcessStatus(processStatuses.get(0), process.getProcessId());
if(process.getProcessError() != null) {
- addProcessError(process.getProcessError(), process.getProcessId());
+ addProcessError(process.getProcessError().get(0), process.getProcessId());
}
} catch (Exception e) {
logger.error(expId, "Error while adding process...", e);
@@ -391,27 +393,27 @@ public class ExperimentRegistry {
public String addProcessStatus(ProcessStatus processStatus, String processID) throws RegistryException {
try {
- ProcessResource processResource = new ProcessResource();
- processResource.setProcessId(processID);
- ProcessStatusResource status = processResource.getProcessStatus();
- ProcessState newState = processStatus.getState();
- if (status == null) {
- status = (ProcessStatusResource) processResource.create(ResourceType.PROCESS_STATUS);
- status.setStatusId(getStatusID("PROCESS_STATE"));
- }else {
- String state = status.getState();
- if (newState != null && !state.equals(newState.toString())){
+ ProcessResource processResource = new ProcessResource();
+ processResource.setProcessId(processID);
+ ProcessStatusResource status = processResource.getProcessStatus();
+ ProcessState newState = processStatus.getState();
+ if (status == null) {
+ status = (ProcessStatusResource) processResource.create(ResourceType.PROCESS_STATUS);
status.setStatusId(getStatusID("PROCESS_STATE"));
+ }else {
+ String state = status.getState();
+ if (newState != null && !state.equals(newState.toString())){
+ status.setStatusId(getStatusID("PROCESS_STATE"));
+ }
}
- }
- status.setProcessId(processID);
- status.setTimeOfStateChange(AiravataUtils.getTime(processStatus.getTimeOfStateChange()));
- if (newState != null){
- status.setState(newState.toString());
- }
- status.setReason(processStatus.getReason());
- status.save();
- logger.debug(processID, "Added process {} status to {}.", processID, processStatus.toString());
+ status.setProcessId(processID);
+ status.setTimeOfStateChange(AiravataUtils.getTime(processStatus.getTimeOfStateChange()));
+ if (newState != null){
+ status.setState(newState.toString());
+ }
+ status.setReason(processStatus.getReason());
+ status.save();
+ logger.debug(processID, "Added process {} status to {}.", processID, processStatus.toString());
} catch (Exception e) {
logger.error(processID, "Error while adding process status...", e);
throw new RegistryException(e);
@@ -752,8 +754,8 @@ public class ExperimentRegistry {
processResource.save();
- if(process.getResourceSchedule() != null) {
- updateProcessResourceSchedule(process.getResourceSchedule(), process.getProcessId());
+ if(process.getProcessResourceSchedule() != null) {
+ updateProcessResourceSchedule(process.getProcessResourceSchedule(), process.getProcessId());
}
if(process.getProcessInputs() != null && process.getProcessInputs().size() > 0) {
updateProcessInputs(process.getProcessInputs(), process.getProcessId());
@@ -762,10 +764,10 @@ public class ExperimentRegistry {
updateProcessOutputs(process.getProcessOutputs(), process.getProcessId());
}
if(process.getProcessStatus() != null) {
- updateProcessStatus(process.getProcessStatus(), process.getProcessId());
+ updateProcessStatus(process.getProcessStatus().get(0), process.getProcessId());
}
if(process.getProcessError() != null) {
- updateProcessError(process.getProcessError(), process.getProcessId());
+ updateProcessError(process.getProcessError().get(0), process.getProcessId());
}
if(process.getTasks() != null && process.getTasks().size() > 0){
for(TaskModel task : process.getTasks()){
@@ -864,8 +866,8 @@ public class ExperimentRegistry {
return addProcessStatus(processStatus, processID);
}
- public String updateProcessError(ErrorModel processError, String processID) throws RegistryException {
- return addProcessError(processError, processID);
+ public String updateProcessError(ErrorModel processErrors, String processID) throws RegistryException {
+ return addProcessError(processErrors, processID);
}
public String updateTask(TaskModel task, String taskID) throws RegistryException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/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 3e04fcd..533e719 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
@@ -384,16 +384,20 @@ public class ThriftDataModelConversion {
ErrorModel errorModel = getErrorModel(processResource.getProcessError());
if (errorModel != null){
- processModel.setProcessError(errorModel);
+ List<ErrorModel> errorModels = new ArrayList<>();
+ errorModels.add(errorModel);
+ processModel.setProcessError(errorModels);
}
ProcessStatus processStatus = getProcessStatus(processResource.getProcessStatus());
if (processStatus != null){
- processModel.setProcessStatus(processStatus);
+ List<ProcessStatus> statuses = new ArrayList<>();
+ statuses.add(processStatus);
+ processModel.setProcessStatus(statuses);
}
ComputationalResourceSchedulingModel schedule = getProcessResourceSchedule(processResource.getProcessResourceSchedule());
if (schedule != null){
- processModel.setResourceSchedule(schedule);
+ processModel.setProcessResourceSchedule(schedule);
}
processModel.setTasks(getTaskModelList(processResource.getTaskList()));
processModel.setStorageResourceId(processResource.getStorageResourceId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
index b780203..0a72923 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
@@ -44,17 +44,17 @@ struct ProcessModel {
2: required string experimentId,
3: optional i64 creationTime,
4: optional i64 lastUpdateTime,
- 5: optional status_models.ProcessStatus processStatus,
+ 5: optional list<status_models.ProcessStatus> processStatus,
6: optional string processDetail,
7: optional string applicationInterfaceId,
8: optional string applicationDeploymentId,
9: optional string computeResourceId,
10: optional list<application_io_models.InputDataObjectType> processInputs,
11: optional list<application_io_models.OutputDataObjectType> processOutputs,
- 12: optional scheduling_model.ComputationalResourceSchedulingModel resourceSchedule,
+ 12: optional scheduling_model.ComputationalResourceSchedulingModel processResourceSchedule,
13: optional list<task_model.TaskModel> tasks,
14: optional string taskDag,
- 15: optional airavata_commons.ErrorModel processError,
+ 15: optional list<airavata_commons.ErrorModel> processError,
16: optional string gatewayExecutionId,
17: optional bool enableEmailNotification,
18: optional list<string> emailAddresses,
[02/10] airavata git commit: updating the registry refactoring code
Posted by sc...@apache.org.
updating the registry refactoring code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3ce49b9a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3ce49b9a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3ce49b9a
Branch: refs/heads/develop
Commit: 3ce49b9a6530bbe0f1c2249668473b67b1bb29ae
Parents: cc009e3
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 29 10:12:34 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 29 10:12:34 2016 -0400
----------------------------------------------------------------------
.../lib/airavata/user_profile_model_types.cpp | 89 +++++++++-----
.../lib/airavata/user_profile_model_types.h | 7 +-
.../resources/lib/Airavata/Model/User/Types.php | 121 +++++++++++--------
.../lib/apache/airavata/model/user/ttypes.py | 117 ++++++++++--------
modules/registry-refactoring/pom.xml | 2 +-
.../entities/expcatalog/ExperimentEntity.java | 20 ++-
.../expcatalog/ExperimentErrorEntity.java | 2 +
.../entities/expcatalog/ExperimentErrorPK.java | 75 ++++++++++++
.../expcatalog/ExperimentInputEntity.java | 5 +-
.../entities/expcatalog/ExperimentInputPK.java | 74 ++++++++++++
.../expcatalog/ExperimentOutputEntity.java | 22 +++-
.../entities/expcatalog/ExperimentOutputPK.java | 74 ++++++++++++
.../expcatalog/ExperimentStatusEntity.java | 83 +++++++++++++
.../entities/expcatalog/ExperimentStatusPK.java | 74 ++++++++++++
.../expcatalog/UserConfigurationEntity.java | 2 +-
.../expcatalog/ExperimentRepository.java | 72 +++++++++++
.../expcatalog/ExperimentRespository.java | 43 -------
.../src/main/resources/META-INF/persistence.xml | 6 +
.../src/main/resources/experiment_catalog.sql | 69 ++++++-----
.../src/main/resources/workspace_catalog.sql | 4 +-
.../core/repositories/RepositoryTest.java | 40 ++++++
.../user-group-models/user_profile_model.thrift | 35 +++---
22 files changed, 797 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
index f89e46f..8dbb408 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
@@ -377,6 +377,10 @@ void UserProfile::__set_userId(const std::string& val) {
this->userId = val;
}
+void UserProfile::__set_gatewayId(const std::string& val) {
+ this->gatewayId = val;
+}
+
void UserProfile::__set_emails(const std::vector<std::string> & val) {
this->emails = val;
}
@@ -472,6 +476,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
bool isset_userModelVersion = false;
bool isset_airavataInternalUserId = false;
bool isset_userId = false;
+ bool isset_gatewayId = false;
bool isset_emails = false;
bool isset_creationTime = false;
bool isset_lastAccessTime = false;
@@ -511,6 +516,14 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 4:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayId);
+ isset_gatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 5:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->emails.clear();
@@ -530,7 +543,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->userName);
this->__isset.userName = true;
@@ -538,7 +551,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orcidId);
this->__isset.orcidId = true;
@@ -546,7 +559,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->phones.clear();
@@ -566,7 +579,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->country);
this->__isset.country = true;
@@ -574,7 +587,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->nationality.clear();
@@ -594,7 +607,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->homeOrganization);
this->__isset.homeOrganization = true;
@@ -602,7 +615,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orginationAffiliation);
this->__isset.orginationAffiliation = true;
@@ -610,7 +623,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->creationTime);
isset_creationTime = true;
@@ -618,7 +631,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->lastAccessTime);
isset_lastAccessTime = true;
@@ -626,7 +639,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->validUntil);
isset_validUntil = true;
@@ -634,7 +647,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast39;
xfer += iprot->readI32(ecast39);
@@ -644,7 +657,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->comments);
this->__isset.comments = true;
@@ -652,7 +665,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->labeledURI.clear();
@@ -672,7 +685,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gpgKey);
this->__isset.gpgKey = true;
@@ -680,7 +693,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->timeZone);
this->__isset.timeZone = true;
@@ -688,7 +701,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 20:
+ case 21:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->nsfDemographics.read(iprot);
this->__isset.nsfDemographics = true;
@@ -711,6 +724,8 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userId)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gatewayId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_emails)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_creationTime)
@@ -741,7 +756,11 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->userId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("emails", ::apache::thrift::protocol::T_LIST, 4);
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeString(this->gatewayId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("emails", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->emails.size()));
std::vector<std::string> ::const_iterator _iter45;
@@ -754,17 +773,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
if (this->__isset.userName) {
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.orcidId) {
- xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 7);
xfer += oprot->writeString(this->orcidId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.phones) {
- xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 7);
+ xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->phones.size()));
std::vector<std::string> ::const_iterator _iter46;
@@ -777,12 +796,12 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.country) {
- xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 9);
xfer += oprot->writeString(this->country);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nationality) {
- xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 9);
+ xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->nationality.size()));
std::vector<std::string> ::const_iterator _iter47;
@@ -795,38 +814,38 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.homeOrganization) {
- xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->homeOrganization);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.orginationAffiliation) {
- xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 12);
xfer += oprot->writeString(this->orginationAffiliation);
xfer += oprot->writeFieldEnd();
}
- xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->creationTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_STRING, 14);
xfer += oprot->writeString(this->lastAccessTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->validUntil);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 15);
+ xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 16);
xfer += oprot->writeI32((int32_t)this->State);
xfer += oprot->writeFieldEnd();
if (this->__isset.comments) {
- xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 17);
xfer += oprot->writeString(this->comments);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.labeledURI) {
- xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 17);
+ xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 18);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->labeledURI.size()));
std::vector<std::string> ::const_iterator _iter48;
@@ -839,17 +858,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gpgKey) {
- xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 18);
+ xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 19);
xfer += oprot->writeString(this->gpgKey);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.timeZone) {
- xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 20);
xfer += oprot->writeString(this->timeZone);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nsfDemographics) {
- xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 20);
+ xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 21);
xfer += this->nsfDemographics.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -863,6 +882,7 @@ void swap(UserProfile &a, UserProfile &b) {
swap(a.userModelVersion, b.userModelVersion);
swap(a.airavataInternalUserId, b.airavataInternalUserId);
swap(a.userId, b.userId);
+ swap(a.gatewayId, b.gatewayId);
swap(a.emails, b.emails);
swap(a.userName, b.userName);
swap(a.orcidId, b.orcidId);
@@ -887,6 +907,7 @@ UserProfile::UserProfile(const UserProfile& other49) {
userModelVersion = other49.userModelVersion;
airavataInternalUserId = other49.airavataInternalUserId;
userId = other49.userId;
+ gatewayId = other49.gatewayId;
emails = other49.emails;
userName = other49.userName;
orcidId = other49.orcidId;
@@ -910,6 +931,7 @@ UserProfile& UserProfile::operator=(const UserProfile& other50) {
userModelVersion = other50.userModelVersion;
airavataInternalUserId = other50.airavataInternalUserId;
userId = other50.userId;
+ gatewayId = other50.gatewayId;
emails = other50.emails;
userName = other50.userName;
orcidId = other50.orcidId;
@@ -936,6 +958,7 @@ void UserProfile::printTo(std::ostream& out) const {
out << "userModelVersion=" << to_string(userModelVersion);
out << ", " << "airavataInternalUserId=" << to_string(airavataInternalUserId);
out << ", " << "userId=" << to_string(userId);
+ out << ", " << "gatewayId=" << to_string(gatewayId);
out << ", " << "emails=" << to_string(emails);
out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
index 4ae9bad..69fa0a0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
@@ -205,13 +205,14 @@ class UserProfile {
UserProfile(const UserProfile&);
UserProfile& operator=(const UserProfile&);
- UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
+ UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), gatewayId(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(), lastAccessTime(), validUntil(), State((Status::type)0), comments(), gpgKey(), timeZone() {
}
virtual ~UserProfile() throw();
std::string userModelVersion;
std::string airavataInternalUserId;
std::string userId;
+ std::string gatewayId;
std::vector<std::string> emails;
std::string userName;
std::string orcidId;
@@ -238,6 +239,8 @@ class UserProfile {
void __set_userId(const std::string& val);
+ void __set_gatewayId(const std::string& val);
+
void __set_emails(const std::vector<std::string> & val);
void __set_userName(const std::string& val);
@@ -280,6 +283,8 @@ class UserProfile {
return false;
if (!(userId == rhs.userId))
return false;
+ if (!(gatewayId == rhs.gatewayId))
+ return false;
if (!(emails == rhs.emails))
return false;
if (__isset.userName != rhs.__isset.userName)
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
index 250ef09..c9aa616 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -440,6 +440,10 @@ class UserProfile {
*/
public $userId = null;
/**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
* @var string[]
*/
public $emails = null;
@@ -524,6 +528,10 @@ class UserProfile {
'type' => TType::STRING,
),
4 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
'var' => 'emails',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -531,15 +539,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 5 => array(
+ 6 => array(
'var' => 'userName',
'type' => TType::STRING,
),
- 6 => array(
+ 7 => array(
'var' => 'orcidId',
'type' => TType::STRING,
),
- 7 => array(
+ 8 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -547,11 +555,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 8 => array(
+ 9 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 9 => array(
+ 10 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -559,35 +567,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 10 => array(
+ 11 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 11 => array(
+ 12 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 12 => array(
+ 13 => array(
'var' => 'creationTime',
'type' => TType::STRING,
),
- 13 => array(
+ 14 => array(
'var' => 'lastAccessTime',
'type' => TType::STRING,
),
- 14 => array(
+ 15 => array(
'var' => 'validUntil',
'type' => TType::STRING,
),
- 15 => array(
+ 16 => array(
'var' => 'State',
'type' => TType::I32,
),
- 16 => array(
+ 17 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 17 => array(
+ 18 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -595,15 +603,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 18 => array(
+ 19 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 19 => array(
+ 20 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 20 => array(
+ 21 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -620,6 +628,9 @@ class UserProfile {
if (isset($vals['userId'])) {
$this->userId = $vals['userId'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
if (isset($vals['emails'])) {
$this->emails = $vals['emails'];
}
@@ -715,6 +726,13 @@ class UserProfile {
}
break;
case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::LST) {
$this->emails = array();
$_size21 = 0;
@@ -731,21 +749,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 6:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 7:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orcidId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 8:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -762,14 +780,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 9:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 10:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -786,56 +804,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 11:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 12:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orginationAffiliation);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 13:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 14:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->lastAccessTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 15:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 16:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 17:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 18:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -852,21 +870,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 19:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 20:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 21:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -902,11 +920,16 @@ class UserProfile {
$xfer += $output->writeString($this->userId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->emails !== null) {
if (!is_array($this->emails)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('emails', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('emails', TType::LST, 5);
{
$output->writeListBegin(TType::STRING, count($this->emails));
{
@@ -920,12 +943,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 6);
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
if ($this->orcidId !== null) {
- $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 6);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 7);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -933,7 +956,7 @@ class UserProfile {
if (!is_array($this->phones)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('phones', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 8);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -947,7 +970,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 8);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 9);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -955,7 +978,7 @@ class UserProfile {
if (!is_array($this->nationality)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nationality', TType::LST, 9);
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 10);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -969,37 +992,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 10);
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11);
$xfer += $output->writeString($this->homeOrganization);
$xfer += $output->writeFieldEnd();
}
if ($this->orginationAffiliation !== null) {
- $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 11);
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 12);
$xfer += $output->writeString($this->orginationAffiliation);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 12);
+ $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 13);
$xfer += $output->writeString($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastAccessTime !== null) {
- $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 13);
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 14);
$xfer += $output->writeString($this->lastAccessTime);
$xfer += $output->writeFieldEnd();
}
if ($this->validUntil !== null) {
- $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 14);
+ $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 15);
$xfer += $output->writeString($this->validUntil);
$xfer += $output->writeFieldEnd();
}
if ($this->State !== null) {
- $xfer += $output->writeFieldBegin('State', TType::I32, 15);
+ $xfer += $output->writeFieldBegin('State', TType::I32, 16);
$xfer += $output->writeI32($this->State);
$xfer += $output->writeFieldEnd();
}
if ($this->comments !== null) {
- $xfer += $output->writeFieldBegin('comments', TType::STRING, 16);
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 17);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1007,7 +1030,7 @@ class UserProfile {
if (!is_array($this->labeledURI)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 17);
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 18);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1021,12 +1044,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 18);
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19);
$xfer += $output->writeString($this->gpgKey);
$xfer += $output->writeFieldEnd();
}
if ($this->timeZone !== null) {
- $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 19);
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 20);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1034,7 +1057,7 @@ class UserProfile {
if (!is_object($this->nsfDemographics)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 20);
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 21);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
index fd7d4b8..7e960e7 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -369,6 +369,7 @@ class UserProfile:
- userModelVersion
- airavataInternalUserId
- userId
+ - gatewayId
- emails
- userName
- orcidId
@@ -393,29 +394,31 @@ class UserProfile:
(1, TType.STRING, 'userModelVersion', None, "1.0", ), # 1
(2, TType.STRING, 'airavataInternalUserId', None, "DO_NOT_SET_AT_CLIENTS", ), # 2
(3, TType.STRING, 'userId', None, None, ), # 3
- (4, TType.LIST, 'emails', (TType.STRING,None), None, ), # 4
- (5, TType.STRING, 'userName', None, None, ), # 5
- (6, TType.STRING, 'orcidId', None, None, ), # 6
- (7, TType.LIST, 'phones', (TType.STRING,None), None, ), # 7
- (8, TType.STRING, 'country', None, None, ), # 8
- (9, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 9
- (10, TType.STRING, 'homeOrganization', None, None, ), # 10
- (11, TType.STRING, 'orginationAffiliation', None, None, ), # 11
- (12, TType.STRING, 'creationTime', None, None, ), # 12
- (13, TType.STRING, 'lastAccessTime', None, None, ), # 13
- (14, TType.STRING, 'validUntil', None, None, ), # 14
- (15, TType.I32, 'State', None, None, ), # 15
- (16, TType.STRING, 'comments', None, None, ), # 16
- (17, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 17
- (18, TType.STRING, 'gpgKey', None, None, ), # 18
- (19, TType.STRING, 'timeZone', None, None, ), # 19
- (20, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 20
+ (4, TType.STRING, 'gatewayId', None, None, ), # 4
+ (5, TType.LIST, 'emails', (TType.STRING,None), None, ), # 5
+ (6, TType.STRING, 'userName', None, None, ), # 6
+ (7, TType.STRING, 'orcidId', None, None, ), # 7
+ (8, TType.LIST, 'phones', (TType.STRING,None), None, ), # 8
+ (9, TType.STRING, 'country', None, None, ), # 9
+ (10, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 10
+ (11, TType.STRING, 'homeOrganization', None, None, ), # 11
+ (12, TType.STRING, 'orginationAffiliation', None, None, ), # 12
+ (13, TType.STRING, 'creationTime', None, None, ), # 13
+ (14, TType.STRING, 'lastAccessTime', None, None, ), # 14
+ (15, TType.STRING, 'validUntil', None, None, ), # 15
+ (16, TType.I32, 'State', None, None, ), # 16
+ (17, TType.STRING, 'comments', None, None, ), # 17
+ (18, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 18
+ (19, TType.STRING, 'gpgKey', None, None, ), # 19
+ (20, TType.STRING, 'timeZone', None, None, ), # 20
+ (21, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 21
)
- def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, emails=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, gatewayId=None, emails=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
self.userModelVersion = userModelVersion
self.airavataInternalUserId = airavataInternalUserId
self.userId = userId
+ self.gatewayId = gatewayId
self.emails = emails
self.userName = userName
self.orcidId = orcidId
@@ -459,6 +462,11 @@ class UserProfile:
else:
iprot.skip(ftype)
elif fid == 4:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.LIST:
self.emails = []
(_etype24, _size21) = iprot.readListBegin()
@@ -468,17 +476,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 5:
+ elif fid == 6:
if ftype == TType.STRING:
self.userName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 6:
+ elif fid == 7:
if ftype == TType.STRING:
self.orcidId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 7:
+ elif fid == 8:
if ftype == TType.LIST:
self.phones = []
(_etype30, _size27) = iprot.readListBegin()
@@ -488,12 +496,12 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 9:
if ftype == TType.STRING:
self.country = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 10:
if ftype == TType.LIST:
self.nationality = []
(_etype36, _size33) = iprot.readListBegin()
@@ -503,42 +511,42 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 10:
+ elif fid == 11:
if ftype == TType.STRING:
self.homeOrganization = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 11:
+ elif fid == 12:
if ftype == TType.STRING:
self.orginationAffiliation = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 13:
if ftype == TType.STRING:
self.creationTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 14:
if ftype == TType.STRING:
self.lastAccessTime = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 15:
if ftype == TType.STRING:
self.validUntil = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 16:
if ftype == TType.I32:
self.State = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 17:
if ftype == TType.STRING:
self.comments = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 18:
if ftype == TType.LIST:
self.labeledURI = []
(_etype42, _size39) = iprot.readListBegin()
@@ -548,17 +556,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 19:
if ftype == TType.STRING:
self.gpgKey = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 20:
if ftype == TType.STRING:
self.timeZone = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 20:
+ elif fid == 21:
if ftype == TType.STRUCT:
self.nsfDemographics = NSFDemographics()
self.nsfDemographics.read(iprot)
@@ -586,84 +594,88 @@ class UserProfile:
oprot.writeFieldBegin('userId', TType.STRING, 3)
oprot.writeString(self.userId)
oprot.writeFieldEnd()
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 4)
+ oprot.writeString(self.gatewayId)
+ oprot.writeFieldEnd()
if self.emails is not None:
- oprot.writeFieldBegin('emails', TType.LIST, 4)
+ oprot.writeFieldBegin('emails', TType.LIST, 5)
oprot.writeListBegin(TType.STRING, len(self.emails))
for iter45 in self.emails:
oprot.writeString(iter45)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 5)
+ oprot.writeFieldBegin('userName', TType.STRING, 6)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
if self.orcidId is not None:
- oprot.writeFieldBegin('orcidId', TType.STRING, 6)
+ oprot.writeFieldBegin('orcidId', TType.STRING, 7)
oprot.writeString(self.orcidId)
oprot.writeFieldEnd()
if self.phones is not None:
- oprot.writeFieldBegin('phones', TType.LIST, 7)
+ oprot.writeFieldBegin('phones', TType.LIST, 8)
oprot.writeListBegin(TType.STRING, len(self.phones))
for iter46 in self.phones:
oprot.writeString(iter46)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.country is not None:
- oprot.writeFieldBegin('country', TType.STRING, 8)
+ oprot.writeFieldBegin('country', TType.STRING, 9)
oprot.writeString(self.country)
oprot.writeFieldEnd()
if self.nationality is not None:
- oprot.writeFieldBegin('nationality', TType.LIST, 9)
+ oprot.writeFieldBegin('nationality', TType.LIST, 10)
oprot.writeListBegin(TType.STRING, len(self.nationality))
for iter47 in self.nationality:
oprot.writeString(iter47)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.homeOrganization is not None:
- oprot.writeFieldBegin('homeOrganization', TType.STRING, 10)
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 11)
oprot.writeString(self.homeOrganization)
oprot.writeFieldEnd()
if self.orginationAffiliation is not None:
- oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 11)
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 12)
oprot.writeString(self.orginationAffiliation)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.STRING, 12)
+ oprot.writeFieldBegin('creationTime', TType.STRING, 13)
oprot.writeString(self.creationTime)
oprot.writeFieldEnd()
if self.lastAccessTime is not None:
- oprot.writeFieldBegin('lastAccessTime', TType.STRING, 13)
+ oprot.writeFieldBegin('lastAccessTime', TType.STRING, 14)
oprot.writeString(self.lastAccessTime)
oprot.writeFieldEnd()
if self.validUntil is not None:
- oprot.writeFieldBegin('validUntil', TType.STRING, 14)
+ oprot.writeFieldBegin('validUntil', TType.STRING, 15)
oprot.writeString(self.validUntil)
oprot.writeFieldEnd()
if self.State is not None:
- oprot.writeFieldBegin('State', TType.I32, 15)
+ oprot.writeFieldBegin('State', TType.I32, 16)
oprot.writeI32(self.State)
oprot.writeFieldEnd()
if self.comments is not None:
- oprot.writeFieldBegin('comments', TType.STRING, 16)
+ oprot.writeFieldBegin('comments', TType.STRING, 17)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
if self.labeledURI is not None:
- oprot.writeFieldBegin('labeledURI', TType.LIST, 17)
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 18)
oprot.writeListBegin(TType.STRING, len(self.labeledURI))
for iter48 in self.labeledURI:
oprot.writeString(iter48)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gpgKey is not None:
- oprot.writeFieldBegin('gpgKey', TType.STRING, 18)
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 19)
oprot.writeString(self.gpgKey)
oprot.writeFieldEnd()
if self.timeZone is not None:
- oprot.writeFieldBegin('timeZone', TType.STRING, 19)
+ oprot.writeFieldBegin('timeZone', TType.STRING, 20)
oprot.writeString(self.timeZone)
oprot.writeFieldEnd()
if self.nsfDemographics is not None:
- oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 20)
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 21)
self.nsfDemographics.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -676,6 +688,8 @@ class UserProfile:
raise TProtocol.TProtocolException(message='Required field airavataInternalUserId is unset!')
if self.userId is None:
raise TProtocol.TProtocolException(message='Required field userId is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
if self.emails is None:
raise TProtocol.TProtocolException(message='Required field emails is unset!')
if self.creationTime is None:
@@ -694,6 +708,7 @@ class UserProfile:
value = (value * 31) ^ hash(self.userModelVersion)
value = (value * 31) ^ hash(self.airavataInternalUserId)
value = (value * 31) ^ hash(self.userId)
+ value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.emails)
value = (value * 31) ^ hash(self.userName)
value = (value * 31) ^ hash(self.orcidId)
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/pom.xml b/modules/registry-refactoring/pom.xml
index b794349..52db507 100644
--- a/modules/registry-refactoring/pom.xml
+++ b/modules/registry-refactoring/pom.xml
@@ -117,7 +117,7 @@
<configuration>
<failIfNoTests>false</failIfNoTests>
<!--<skipTests>${skipTests}</skipTests>-->
- <skipTests>true</skipTests>
+ <skipTests>false</skipTests>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index 5b9d15a..796253f 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -43,8 +43,9 @@ public class ExperimentEntity {
private List<ExperimentInputEntity> experimentInputs;
private List<ExperimentOutputEntity> experimentOutputs;
private List<ExperimentErrorEntity> experimentErrors;
+ private List<ExperimentStatusEntity> experimentStatuses;
- private UserConfigurationEntity userConfiguration;
+ private UserConfigurationEntity userConfigurationData;
@Id
@Column(name = "EXPERIMENT_ID")
@@ -166,12 +167,12 @@ public class ExperimentEntity {
}
@OneToOne(targetEntity = UserConfigurationEntity.class, cascade = CascadeType.ALL, mappedBy = "experiment")
- public UserConfigurationEntity getUserConfiguration() {
- return userConfiguration;
+ public UserConfigurationEntity getUserConfigurationData() {
+ return userConfigurationData;
}
- public void setUserConfiguration(UserConfigurationEntity userConfiguration) {
- this.userConfiguration = userConfiguration;
+ public void setUserConfigurationData(UserConfigurationEntity userConfiguration) {
+ this.userConfigurationData = userConfiguration;
}
@OneToMany(targetEntity = ExperimentInputEntity.class, cascade = CascadeType.ALL, mappedBy = "experiment")
@@ -200,4 +201,13 @@ public class ExperimentEntity {
public void setExperimentErrors(List<ExperimentErrorEntity> experimentErrors) {
this.experimentErrors = experimentErrors;
}
+
+ @OneToMany(targetEntity = ExperimentStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "experiment")
+ public List<ExperimentStatusEntity> getExperimentStatuses() {
+ return experimentStatuses;
+ }
+
+ public void setExperimentStatuses(List<ExperimentStatusEntity> experimentStatuses) {
+ this.experimentStatuses = experimentStatuses;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
index 45c47ad..374a156 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -25,6 +25,7 @@ import java.util.List;
@Entity
@Table(name = "EXPERIMENT_ERROR")
+@IdClass(ExperimentErrorPK.class)
public class ExperimentErrorEntity {
private String errorId;
private String experimentId;
@@ -46,6 +47,7 @@ public class ExperimentErrorEntity {
this.errorId = errorId;
}
+ @Id
@Column(name = "EXPERIMENT_ID")
public String getExperimentId() {
return experimentId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java
new file mode 100644
index 0000000..add5616
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorPK.java
@@ -0,0 +1,75 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ExperimentErrorPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ExperimentErrorPK.class);
+ private String errorId;
+ private String experimentId;
+
+ @Column(name = "ERROR_ID")
+ @Id
+ public String getErrorId() {
+ return errorId;
+ }
+
+ public void setErrorId(String errorId) {
+ this.errorId = errorId;
+ }
+
+ @Column(name = "EXPERIMENT_ID")
+ @Id
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExperimentErrorPK that = (ExperimentErrorPK) o;
+
+ if (getErrorId() != null ? !getErrorId().equals(that.getErrorId()) : that.getErrorId() != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getErrorId() != null ? getErrorId().hashCode() : 0;
+ result = 31 * result + (getExperimentId() != null ? getExperimentId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index eeca021..7850c17 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -24,6 +24,7 @@ import javax.persistence.*;
@Entity
@Table(name = "EXPERIMENT_INPUT")
+@IdClass(ExperimentInputPK.class)
public class ExperimentInputEntity {
private String experimentId;
public String name;
@@ -51,6 +52,7 @@ public class ExperimentInputEntity {
this.experimentId = experimentId;
}
+ @Id
@Column(name = "INPUT_NAME")
public String getName() {
return name;
@@ -105,6 +107,7 @@ public class ExperimentInputEntity {
this.userFriendlyDescription = userFriendlyDescription;
}
+ @Lob
@Column(name = "METADATA")
public String getMetaData() {
return metaData;
@@ -128,7 +131,7 @@ public class ExperimentInputEntity {
return isRequired;
}
- public void setIsRequired(boolean isRequired) {
+ public void setRequired(boolean isRequired) {
this.isRequired = isRequired;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.java
new file mode 100644
index 0000000..3479878
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ExperimentInputPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ExperimentInputPK.class);
+ private String experimentId;
+ private String name;
+
+ @Id
+ @Column(name = "EXPERIMENT_ID")
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+ @Id
+ @Column(name = "INPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExperimentInputPK that = (ExperimentInputPK) o;
+
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getExperimentId() != null ? getExperimentId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index 9cb2702..891cf79 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -20,13 +20,11 @@
*/
package org.apache.airavata.registry.core.entities.expcatalog;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
@Entity
@Table(name = "EXPERIMENT_OUTPUT")
+@IdClass(ExperimentOutputPK.class)
public class ExperimentOutputEntity {
private String experimentId;
public String name;
@@ -41,6 +39,9 @@ public class ExperimentOutputEntity {
public boolean outputStreaming;
public String storageResourceId;
+ private ExperimentEntity experiment;
+
+
@Id
@Column(name = "EXPERIMENT_ID")
public String getExperimentId() {
@@ -51,6 +52,7 @@ public class ExperimentOutputEntity {
this.experimentId = experimentId;
}
+ @Id
@Column(name = "OUTPUT_NAME")
public String getName() {
return name;
@@ -92,7 +94,7 @@ public class ExperimentOutputEntity {
return isRequired;
}
- public void setIsRequired(boolean isRequired) {
+ public void setRequired(boolean isRequired) {
this.isRequired = isRequired;
}
@@ -150,4 +152,14 @@ public class ExperimentOutputEntity {
public void setStorageResourceId(String storageResourceId) {
this.storageResourceId = storageResourceId;
}
+
+ @ManyToOne(targetEntity = ExperimentEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
+ public ExperimentEntity getExperiment() {
+ return experiment;
+ }
+
+ public void setExperiment(ExperimentEntity experiment) {
+ this.experiment = experiment;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.java
new file mode 100644
index 0000000..da2864c
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ExperimentOutputPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ExperimentOutputPK.class);
+ private String experimentId;
+ private String name;
+
+ @Id
+ @Column(name = "EXPERIMENT_ID")
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+ @Id
+ @Column(name = "OUTPUT_NAME")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExperimentOutputPK that = (ExperimentOutputPK) o;
+
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+ if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getExperimentId() != null ? getExperimentId().hashCode() : 0;
+ result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
new file mode 100644
index 0000000..48b822f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "EXPERIMENT_STATUS")
+@IdClass(ExperimentStatusPK.class)
+public class ExperimentStatusEntity {
+ private String experimentId;
+ private String state;
+ private long timeOfStateChange;
+ private String reason;
+
+ private ExperimentEntity experiment;
+
+ @Id
+ @Column(name = "EXPERIMENT_ID")
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+ @Id
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Column(name = "TIME_OF_STATE_CHANGE")
+ public long getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(long timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ @ManyToOne(targetEntity = ExperimentEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
+ public ExperimentEntity getExperiment() {
+ return experiment;
+ }
+
+ public void setExperiment(ExperimentEntity experiment) {
+ this.experiment = experiment;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.java
new file mode 100644
index 0000000..4c52ec6
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class ExperimentStatusPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(ExperimentStatusPK.class);
+ private String state;
+ private String experimentId;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Id
+ @Column(name = "EXPERIMENT_ID")
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ExperimentStatusPK that = (ExperimentStatusPK) o;
+
+ if (getState() != null ? !getState().equals(that.getState()) : that.getState() != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getState() != null ? getState().hashCode() : 0;
+ result = 31 * result + (getExperimentId() != null ? getExperimentId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
index 06e3b37..7d27251 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "USER_CONFIGURATION_ENTITY")
+@Table(name = "USER_CONFIGURATION")
public class UserConfigurationEntity {
private String experimentId;
private boolean airavataAutoSchedule;
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
new file mode 100644
index 0000000..b20650d
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -0,0 +1,72 @@
+/*
+ *
+ * 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.repositories.expcatalog;
+
+import org.apache.airavata.model.experiment.ExperimentModel;
+import org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity;
+import org.apache.airavata.registry.core.repositories.AbstractRepository;
+import org.apache.airavata.registry.core.utils.JPAUtils;
+import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
+import org.dozer.Mapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class ExperimentRepository extends AbstractRepository<ExperimentModel, ExperimentEntity, String> {
+ private final static Logger logger = LoggerFactory.getLogger(ExperimentRepository.class);
+
+ public ExperimentRepository(Class<ExperimentModel> thriftGenericClass, Class<ExperimentEntity> dbEntityGenericClass) {
+ super(thriftGenericClass, dbEntityGenericClass);
+ }
+
+ @Override
+ public ExperimentModel create(ExperimentModel experiment){
+ return update(experiment);
+ }
+
+ @Override
+ public ExperimentModel update(ExperimentModel experiment){
+ String experimentId = experiment.getExperimentId();
+ Mapper mapper = ObjectMapperSingleton.getInstance();
+ ExperimentEntity entity = mapper.map(experiment, ExperimentEntity.class);
+
+ if(entity.getUserConfigurationData() != null)
+ entity.getUserConfigurationData().setExperimentId(experimentId);
+ if(entity.getExperimentInputs() != null)
+ entity.getExperimentInputs().forEach(expIn->expIn.setExperimentId(experimentId));
+ if(entity.getExperimentOutputs() != null)
+ entity.getExperimentOutputs().forEach(expOut->expOut.setExperimentId(experimentId));
+ if(entity.getExperimentErrors() != null)
+ entity.getExperimentErrors().forEach(expErr->expErr.setExperimentId(experimentId));
+ if(entity.getExperimentStatuses() != null)
+ entity.getExperimentStatuses().forEach(expStatus->expStatus.setExperimentId(experimentId));
+
+ ExperimentEntity persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity));
+ return mapper.map(persistedCopy, ExperimentModel.class);
+ }
+
+ @Override
+ public List<ExperimentModel> select(String criteria, int offset, int limit){
+ throw new UnsupportedOperationException("Due to performance overheads this method is not supported. Instead use" +
+ " ExperimentSummaryRepository");
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRespository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRespository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRespository.java
deleted file mode 100644
index 62d0976..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRespository.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core.repositories.expcatalog;
-
-import org.apache.airavata.model.experiment.ExperimentModel;
-import org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity;
-import org.apache.airavata.registry.core.repositories.AbstractRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class ExperimentRespository extends AbstractRepository<ExperimentModel, ExperimentEntity, String> {
- private final static Logger logger = LoggerFactory.getLogger(ExperimentRespository.class);
-
- public ExperimentRespository(Class<ExperimentModel> thriftGenericClass, Class<ExperimentEntity> dbEntityGenericClass) {
- super(thriftGenericClass, dbEntityGenericClass);
- }
-
- @Override
- public List<ExperimentModel> select(String criteria, int offset, int limit){
- throw new UnsupportedOperationException("Due to performance overheads this method is not supported. Instead use" +
- " ExperimentSummaryRepository");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
index 8c6bddb..f7d72f3 100644
--- a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
@@ -27,7 +27,13 @@
<class>org.apache.airavata.registry.core.entities.workspacecatalog.NSFDemographicsEntity</class>
<class>org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity</class>
<class>org.apache.airavata.registry.core.entities.workspacecatalog.ProjectEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ComputeResourceSchedulingEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentErrorEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentInputEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentOutputEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentStatusEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.UserConfigurationEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
index 95b7c54..4d401a3 100644
--- a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
+++ b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
@@ -11,12 +11,12 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT(
EXECUTION_ID VARCHAR (255),
GATEWAY_EXECUTION_ID VARCHAR (255),
GATEWAY_INSTANCE_ID VARCHAR (255),
- ENABLE_EMAIL_NOTIFICATION TINYINT,
+ ENABLE_EMAIL_NOTIFICATION TINYINT(1),
PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID),
- FOREIGN KEY (USER_ID) REFERENCES USER_PROFILE(USER_ID)
-)
+ FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE,
+ FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
+ FOREIGN KEY (USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+);
CREATE TABLE IF NOT EXISTS EXPERIMENT_EMAIL (
EXPERIMENT_ID VARCHAR (255),
@@ -27,16 +27,16 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_EMAIL (
CREATE TABLE IF NOT EXISTS USER_CONFIGURATION(
EXPERIMENT_ID VARCHAR (255),
- AIRAVATA_AUTO_SCHEDULE TINYINT,
- OVERRIDE_MANUAL_SCHEDULED_PARAMS TINYINT,
- THROTTLE_RESOURCE TINYINT,
+ AIRAVATA_AUTO_SCHEDULE TINYINT(1),
+ OVERRIDE_MANUAL_SCHEDULED_PARAMS TINYINT(1),
+ THROTTLE_RESOURCE TINYINT(1),
USER_DN VARCHAR (255),
- GENERATE_CERT TINYINT,
+ GENERATE_CERT TINYINT(1),
STORAGE_ID VARCHAR (255),
EXPERIMENT_DATA_DIR VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)
+);
CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING(
EXPERIMENT_ID VARCHAR (255),
@@ -53,8 +53,8 @@ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING(
OVERRIDE_SCRATCH_LOCATION VARCHAR (255),
OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES USER_CONFIGURATION(EXPERIMENT_ID)
-)
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES USER_CONFIGURATION(EXPERIMENT_ID) ON DELETE CASCADE
+);
CREATE TABLE IF NOT EXISTS EXPERIMENT_INPUT(
EXPERIMENT_ID VARCHAR (255),
@@ -62,34 +62,34 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_INPUT(
INPUT_VALUE VARCHAR (255),
INPUT_TYPE VARCHAR (255),
APPLICATION_ARGUMENT VARCHAR (255),
- STANDARD_INPUT TINYINT,
+ STANDARD_INPUT TINYINT(1),
USER_FRIENDLY_DESCRIPTION VARCHAR (255),
METADATA VARCHAR (4096),
INPUT_ORDER INT,
- REQUIRED TINYINT,
- REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT,
- DATA_STAGED TINYINT,
+ REQUIRED TINYINT(1),
+ REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT(1),
+ DATA_STAGED TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID,INPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
-)
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
CREATE TABLE IF NOT EXISTS EXPERIMENT_OUTPUT(
EXPERIMENT_ID VARCHAR (255),
OUTPUT_NAME VARCHAR (255),
OUTPUT_VALUE VARCHAR (255),
OUTPUT_TYPE VARCHAR (255),
- APPLICATION_ARGUMENT (255),
- REQUIRED TINYINT,
- REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT,
- DATA_MOVEMENT TINYINT,
+ APPLICATION_ARGUMENT VARCHAR (255),
+ REQUIRED TINYINT(1),
+ REQUIRED_TO_ADDED_TO_COMMANDLINE TINYINT(1),
+ DATA_MOVEMENT TINYINT(1),
LOCATION VARCHAR (255),
SEARCH_QUERY VARCHAR (255),
- OUTPUT_STREAMING TINYINT,
+ OUTPUT_STREAMING TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID,OUTPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
-)
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR(
ERROR_ID VARCHAR (255),
@@ -98,13 +98,22 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR(
ACTUAL_ERROR_MESSAGE VARCHAR (255),
USER_FRIENDLY_MESSAGE VARCHAR (255),
TRANSIENT_OR_PERSISTENT TINYINT,
- PRIMARY KEY (ERROR_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID)
-)
+ PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID(
ERROR_ID VARCHAR (255),
ROOT_CAUSE_ERROR_ID VARCHAR (255),
PRIMARY KEY (ERROR_ID, ROOT_CAUSE_ERROR_ID),
- FOREIGN KEY(ERROR_ID) REFERENCES EXPERIMENT_ERROR(ERROR_ID)
-)
\ No newline at end of file
+ FOREIGN KEY(ERROR_ID) REFERENCES EXPERIMENT_ERROR(ERROR_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_STATUS(
+ EXPERIMENT_ID VARCHAR (255),
+ STATE VARCHAR (255),
+ TIME_OF_STATE_CHANGE BIGINT,
+ REASON VARCHAR (255),
+ PRIMARY KEY (EXPERIMENT_ID, STATE),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ce49b9a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql b/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
index 4ea7cd2..8b87bc2 100644
--- a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
+++ b/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
@@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS USER_PROFILE (
GPG_KEY VARCHAR (8192),
TIME_ZONE VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID)
+ FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS USER_PROFILE_EMAIL (
@@ -121,5 +121,5 @@ CREATE TABLE IF NOT EXISTS PROJECT(
CREATION_TIME BIGINT,
PRIMARY KEY (PROJECT_ID),
FOREIGN KEY(OWNER) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY(GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID)
+ FOREIGN KEY(GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
);
\ No newline at end of file
[06/10] airavata git commit: adding job and task database models
Posted by sc...@apache.org.
adding job and task database models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eee49d36
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eee49d36
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eee49d36
Branch: refs/heads/develop
Commit: eee49d36c2ea2e9ab379c2ebfb2bd51a0ab647e6
Parents: 171c042
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 29 15:13:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 29 15:13:53 2016 -0400
----------------------------------------------------------------------
.../ComputeResourceSchedulingEntity.java | 2 +-
.../entities/expcatalog/ExperimentEntity.java | 4 +-
.../expcatalog/ExperimentErrorEntity.java | 2 +-
.../expcatalog/ExperimentInputEntity.java | 2 +-
.../expcatalog/ExperimentOutputEntity.java | 2 +-
.../expcatalog/ExperimentStatusEntity.java | 2 +-
.../core/entities/expcatalog/JobEntity.java | 165 +++++++++++++++++++
.../entities/expcatalog/JobStatusEntity.java | 83 ++++++++++
.../core/entities/expcatalog/JobStatusPK.java | 74 +++++++++
.../core/entities/expcatalog/ProcessEntity.java | 12 +-
.../entities/expcatalog/ProcessErrorEntity.java | 4 +-
.../entities/expcatalog/ProcessInputEntity.java | 2 +-
.../expcatalog/ProcessOutputEntity.java | 2 +-
.../ProcessResourceSchedulingEntity.java | 2 +-
.../expcatalog/ProcessStatusEntity.java | 2 +-
.../core/entities/expcatalog/TaskEntity.java | 147 +++++++++++++++++
.../entities/expcatalog/TaskErrorEntity.java | 118 +++++++++++++
.../core/entities/expcatalog/TaskErrorPK.java | 75 +++++++++
.../entities/expcatalog/TaskStatusEntity.java | 83 ++++++++++
.../core/entities/expcatalog/TaskStatusPK.java | 74 +++++++++
.../expcatalog/UserConfigurationEntity.java | 2 +-
.../workspacecatalog/GatewayEntity.java | 2 +-
.../workspacecatalog/NSFDemographicsEntity.java | 2 +-
.../workspacecatalog/NotificationEntity.java | 2 +-
.../workspacecatalog/ProjectEntity.java | 2 +-
.../workspacecatalog/UserProfileEntity.java | 2 +-
.../expcatalog/ExperimentRepository.java | 9 +
.../src/main/resources/META-INF/persistence.xml | 5 +
.../src/main/resources/experiment_catalog.sql | 132 ++++++++++-----
.../src/main/resources/workspace_catalog.sql | 48 +++---
30 files changed, 982 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputeResourceSchedulingEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputeResourceSchedulingEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputeResourceSchedulingEntity.java
index 76eb5ea..bfbb3e2 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputeResourceSchedulingEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputeResourceSchedulingEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "COMPUTE_RESOURCE_SCHEDULING")
+@Table(name = "EXPCAT_COMPUTE_RESOURCE_SCHEDULING")
public class ComputeResourceSchedulingEntity {
private String experimentId;
private String resourceHostId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index a0686f8..e7ea3f6 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name = "EXPERIMENT")
+@Table(name = "EXPCAT_EXPERIMENT")
public class ExperimentEntity {
public String experimentId;
public String projectId;
@@ -159,7 +159,7 @@ public class ExperimentEntity {
}
@ElementCollection
- @CollectionTable(name="EXPERIMENT_EMAIL", joinColumns = @JoinColumn(name="EXPERIMENT_ID"))
+ @CollectionTable(name="EXPCAT_EXPERIMENT_EMAIL", joinColumns = @JoinColumn(name="EXPERIMENT_ID"))
public List<String> getEmailAddresses() {
return emailAddresses;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
index 374a156..37df525 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name = "EXPERIMENT_ERROR")
+@Table(name = "EXPCAT_EXPERIMENT_ERROR")
@IdClass(ExperimentErrorPK.class)
public class ExperimentErrorEntity {
private String errorId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index 7850c17..4a9b2c0 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "EXPERIMENT_INPUT")
+@Table(name = "EXPCAT_EXPERIMENT_INPUT")
@IdClass(ExperimentInputPK.class)
public class ExperimentInputEntity {
private String experimentId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
index 891cf79..871fcd7 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "EXPERIMENT_OUTPUT")
+@Table(name = "EXPCAT_EXPERIMENT_OUTPUT")
@IdClass(ExperimentOutputPK.class)
public class ExperimentOutputEntity {
private String experimentId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
index 48b822f..7a73e78 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentStatusEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "EXPERIMENT_STATUS")
+@Table(name = "EXPCAT_EXPERIMENT_STATUS")
@IdClass(ExperimentStatusPK.class)
public class ExperimentStatusEntity {
private String experimentId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
new file mode 100644
index 0000000..a66295e
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -0,0 +1,165 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "EXPCAT_JOB")
+public class JobEntity {
+ private String jobId;
+ private String taskId;
+ private String processId;
+ private String jobDescription;
+ private long creationTime;
+ private String computeResourceConsumed;
+ private String jobName;
+ private String workingDir;
+ private String stdOut;
+ private String stdErr;
+ private int exitCode;
+
+ private List<JobStatusEntity> jobStatus;
+
+ private TaskEntity task;
+
+ @Id
+ @Column(name = "JOB_ID")
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Column(name = "JOB_DESCRIPTION")
+ public String getJobDescription() {
+ return jobDescription;
+ }
+
+ public void setJobDescription(String jobDescription) {
+ this.jobDescription = jobDescription;
+ }
+
+ @Column(name = "CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "COMPUTE_RESOURCE_CONSUMED")
+ public String getComputeResourceConsumed() {
+ return computeResourceConsumed;
+ }
+
+ public void setComputeResourceConsumed(String computeResourceConsumed) {
+ this.computeResourceConsumed = computeResourceConsumed;
+ }
+
+ @Column(name = "JOB_NAME")
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ @Column(name = "WORKING_DIR")
+ public String getWorkingDir() {
+ return workingDir;
+ }
+
+ public void setWorkingDir(String workingDir) {
+ this.workingDir = workingDir;
+ }
+
+ @Lob
+ @Column(name = "STDOUT")
+ public String getStdOut() {
+ return stdOut;
+ }
+
+ public void setStdOut(String stdOut) {
+ this.stdOut = stdOut;
+ }
+
+ @Lob
+ @Column(name = "STDERR")
+ public String getStdErr() {
+ return stdErr;
+ }
+
+ public void setStdErr(String stdErr) {
+ this.stdErr = stdErr;
+ }
+
+ @Column(name = "EXIT_CODE")
+ public int getExitCode() {
+ return exitCode;
+ }
+
+ public void setExitCode(int exitCode) {
+ this.exitCode = exitCode;
+ }
+
+ @OneToMany(targetEntity = JobStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "job")
+ public List<JobStatusEntity> getJobStatus() {
+ return jobStatus;
+ }
+
+ public void setJobStatus(List<JobStatusEntity> jobStatus) {
+ this.jobStatus = jobStatus;
+ }
+
+ @ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "TASK_ID", referencedColumnName = "TASK_ID")
+ public TaskEntity getTask() {
+ return task;
+ }
+
+ public void setTask(TaskEntity task) {
+ this.task = task;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
new file mode 100644
index 0000000..bcc902b
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusEntity.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "EXPCAT_JOB_STATUS")
+@IdClass(JobStatusPK.class)
+public class JobStatusEntity {
+ private String jobId;
+ private String state;
+ private long timeOfStateChange;
+ private String reason;
+
+ private JobEntity job;
+
+ @Id
+ @Column(name = "JOB_ID")
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ @Id
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Column(name = "TIME_OF_STATE_CHANGE")
+ public long getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(long timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ @ManyToOne(targetEntity = JobEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "JOB_ID", referencedColumnName = "JOB_ID")
+ public JobEntity getJob() {
+ return job;
+ }
+
+ public void setJob(JobEntity job) {
+ this.job = job;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobStatusPK.java
new file mode 100644
index 0000000..fa8964f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/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.entities.expcatalog;
+
+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 state;
+ private String jobId;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @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 (getState() != null ? !getState().equals(that.getState()) : that.getState() != null) return false;
+ if (getJobId() != null ? !getJobId().equals(that.getJobId()) : that.getJobId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getState() != null ? getState().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/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index d7c6cca..109041e 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -25,7 +25,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name = "PROCESS")
+@Table(name = "EXPCAT_PROCESS")
public class ProcessEntity {
private String processId;
private String experimentId;
@@ -50,6 +50,7 @@ public class ProcessEntity {
private List<ProcessInputEntity> processInputs;
private List<ProcessOutputEntity> processOutputs;
private ProcessResourceSchedulingEntity processResourceSchedule;
+ private List<TaskEntity> tasks;
private ExperimentEntity experiment;
@@ -254,6 +255,15 @@ public class ProcessEntity {
this.processResourceSchedule = proceeResourceSchedule;
}
+ @OneToMany(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public List<TaskEntity> getTasks() {
+ return tasks;
+ }
+
+ public void setTasks(List<TaskEntity> tasks) {
+ this.tasks = tasks;
+ }
+
@ManyToOne(targetEntity = ExperimentEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
public ExperimentEntity getExperiment() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
index bae331f..60ad9b2 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name = "PROCESS_ERROR")
+@Table(name = "EXPCAT_PROCESS_ERROR")
@IdClass(ProcessErrorPK.class)
public class ProcessErrorEntity {
private String errorId;
@@ -96,7 +96,7 @@ public class ProcessErrorEntity {
@ElementCollection
- @CollectionTable(name="EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
+ @CollectionTable(name="EXPCAT_EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
public List<String> getRootCauseErrorIdList() {
return rootCauseErrorIdList;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
index a63ff37..850c4a9 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "PROCESS_INPUT")
+@Table(name = "EXPCAT_PROCESS_INPUT")
@IdClass(ProcessInputPK.class)
public class ProcessInputEntity {
private String processId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
index 06181bc..4226f7a 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "PROCESS_OUTPUT")
+@Table(name = "EXPCAT_PROCESS_OUTPUT")
@IdClass(ProcessOutputPK.class)
public class ProcessOutputEntity {
private String processId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
index 11f167d..3a64f42 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceSchedulingEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "PROCESS_RESOURCE_SCHEDULING")
+@Table(name = "EXPCAT_PROCESS_RESOURCE_SCHEDULING")
public class ProcessResourceSchedulingEntity {
private String processId;
private String resourceHostId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
index ea816b5..7a3c30e 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessStatusEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "PROCESS_STATUS")
+@Table(name = "EXPCAT_PROCESS_STATUS")
@IdClass(ProcessStatusPK.class)
public class ProcessStatusEntity {
private String processId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
new file mode 100644
index 0000000..f01fa10
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -0,0 +1,147 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import org.apache.airavata.model.task.TaskTypes;
+
+import javax.persistence.*;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+@Entity
+@Table(name = "EXPCAT_TASK")
+public class TaskEntity {
+ private String taskId;
+ private TaskTypes taskType;
+ private String parentProcessId;
+ private long creationTime;
+ private long lastUpdateTime;
+ private String taskDetail;
+ private ByteBuffer subTaskModel;
+
+ private List<TaskStatusEntity> taskStatus;
+ private List<TaskErrorEntity> taskError;
+ private List<JobEntity> jobs;
+
+ private ProcessEntity process;
+
+ @Id
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Column(name = "TASK_TYPE")
+ public TaskTypes getTaskType() {
+ return taskType;
+ }
+
+ public void setTaskType(TaskTypes taskType) {
+ this.taskType = taskType;
+ }
+
+ @Column(name = "PARENT_PROCESS_ID")
+ public String getParentProcessId() {
+ return parentProcessId;
+ }
+
+ public void setParentProcessId(String parentProcessId) {
+ this.parentProcessId = parentProcessId;
+ }
+
+ @Column(name = "CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "LAST_UPDATE_TIME")
+ public long getLastUpdateTime() {
+ return lastUpdateTime;
+ }
+
+ public void setLastUpdateTime(long lastUpdateTime) {
+ this.lastUpdateTime = lastUpdateTime;
+ }
+
+ @Column(name = "TASK_DETAIL")
+ public String getTaskDetail() {
+ return taskDetail;
+ }
+
+ public void setTaskDetail(String taskDetail) {
+ this.taskDetail = taskDetail;
+ }
+
+ @Lob
+ @Column(name = "SUB_TASK_MODEL")
+ public ByteBuffer getSubTaskModel() {
+ return subTaskModel;
+ }
+
+ public void setSubTaskModel(ByteBuffer subTaskModel) {
+ this.subTaskModel = subTaskModel;
+ }
+
+ @OneToMany(targetEntity = TaskStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
+ public List<TaskStatusEntity> getTaskStatus() {
+ return taskStatus;
+ }
+
+ public void setTaskStatus(List<TaskStatusEntity> taskStatus) {
+ this.taskStatus = taskStatus;
+ }
+
+ @OneToMany(targetEntity = TaskErrorEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
+ public List<TaskErrorEntity> getTaskError() {
+ return taskError;
+ }
+
+ public void setTaskError(List<TaskErrorEntity> taskError) {
+ this.taskError = taskError;
+ }
+
+ @OneToMany(targetEntity = JobEntity.class, cascade = CascadeType.ALL, mappedBy = "task")
+ public List<JobEntity> getJobs() {
+ return jobs;
+ }
+
+ public void setJobs(List<JobEntity> jobs) {
+ this.jobs = jobs;
+ }
+
+ @ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "PARENT_PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
new file mode 100644
index 0000000..d269ab7
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
@@ -0,0 +1,118 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "EXPCAT_TASK_ERROR")
+@IdClass(TaskErrorPK.class)
+public class TaskErrorEntity {
+ private String errorId;
+ private String taskId;
+ private long creationTime;
+ private String actualErrorMessage;
+ private String userFriendlyMessage;
+ private boolean transientOrPersistent;
+ private List<String> rootCauseErrorIdList;
+
+ private TaskEntity task;
+
+ @Id
+ @Column(name = "ERROR_ID")
+ public String getErrorId() {
+ return errorId;
+ }
+
+ public void setErrorId(String errorId) {
+ this.errorId = errorId;
+ }
+
+ @Id
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Column(name = "CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "ACTUAL_ERROR_MESSAGE")
+ public String getActualErrorMessage() {
+ return actualErrorMessage;
+ }
+
+ public void setActualErrorMessage(String actualErrorMessage) {
+ this.actualErrorMessage = actualErrorMessage;
+ }
+
+ @Column(name = "USER_FRIENDLY_MESSAGE")
+ public String getUserFriendlyMessage() {
+ return userFriendlyMessage;
+ }
+
+ public void setUserFriendlyMessage(String userFriendlyMessage) {
+ this.userFriendlyMessage = userFriendlyMessage;
+ }
+
+
+ @Column(name = "TRANSIENT_OR_PERSISTENT")
+ public boolean isTransientOrPersistent() {
+ return transientOrPersistent;
+ }
+
+ public void setTransientOrPersistent(boolean transientOrPersistent) {
+ this.transientOrPersistent = transientOrPersistent;
+ }
+
+
+ @ElementCollection
+ @CollectionTable(name="EXPCAT_EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
+ public List<String> getRootCauseErrorIdList() {
+ return rootCauseErrorIdList;
+ }
+
+ public void setRootCauseErrorIdList(List<String> rootCauseErrorIdList) {
+ this.rootCauseErrorIdList = rootCauseErrorIdList;
+ }
+
+
+ @ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "TASK_ID", referencedColumnName = "TASK_ID")
+ public TaskEntity getTask() {
+ return task;
+ }
+
+ public void setTask(TaskEntity task) {
+ this.task = task;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
new file mode 100644
index 0000000..e504f83
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
@@ -0,0 +1,75 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class TaskErrorPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(TaskErrorPK.class);
+ private String errorId;
+ private String taskId;
+
+ @Column(name = "ERROR_ID")
+ @Id
+ public String getErrorId() {
+ return errorId;
+ }
+
+ public void setErrorId(String errorId) {
+ this.errorId = errorId;
+ }
+
+ @Column(name = "TASK_ID")
+ @Id
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String processId) {
+ this.taskId = taskId;
+ }
+
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ TaskErrorPK that = (TaskErrorPK) o;
+
+ if (getErrorId() != null ? !getErrorId().equals(that.getErrorId()) : that.getErrorId() != null) return false;
+ if (getTaskId() != null ? !getTaskId().equals(that.getTaskId()) : that.getTaskId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getErrorId() != null ? getErrorId().hashCode() : 0;
+ result = 31 * result + (getTaskId() != null ? getTaskId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
new file mode 100644
index 0000000..2465b48
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusEntity.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "EXPCAT_TASK_STATUS")
+@IdClass(TaskStatusPK.class)
+public class TaskStatusEntity {
+ private String taskId;
+ private String state;
+ private long timeOfStateChange;
+ private String reason;
+
+ private TaskEntity task;
+
+ @Id
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Id
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Column(name = "TIME_OF_STATE_CHANGE")
+ public long getTimeOfStateChange() {
+ return timeOfStateChange;
+ }
+
+ public void setTimeOfStateChange(long timeOfStateChange) {
+ this.timeOfStateChange = timeOfStateChange;
+ }
+
+ @Column(name = "REASON")
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ @ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "TASK_ID", referencedColumnName = "TASK_ID")
+ public TaskEntity getTask() {
+ return task;
+ }
+
+ public void setTask(TaskEntity task) {
+ this.task = task;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.java
new file mode 100644
index 0000000..167d8a7
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskStatusPK.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.entities.expcatalog;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+public class TaskStatusPK implements Serializable {
+ private final static Logger logger = LoggerFactory.getLogger(TaskStatusPK.class);
+ private String state;
+ private String taskId;
+
+ @Id
+ @Column(name = "STATUS_ID")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Id
+ @Column(name = "TASK_ID")
+ public String getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(String taskId) {
+ this.taskId = taskId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ TaskStatusPK that = (TaskStatusPK) o;
+
+ if (getState() != null ? !getState().equals(that.getState()) : that.getState() != null) return false;
+ if (getTaskId() != null ? !getTaskId().equals(that.getTaskId()) : that.getTaskId() != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = getState() != null ? getState().hashCode() : 0;
+ result = 31 * result + (getTaskId() != null ? getTaskId().hashCode() : 0);
+ return result;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
index 7d27251..b685312 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserConfigurationEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.expcatalog;
import javax.persistence.*;
@Entity
-@Table(name = "USER_CONFIGURATION")
+@Table(name = "EXPCAT_USER_CONFIGURATION")
public class UserConfigurationEntity {
private String experimentId;
private boolean airavataAutoSchedule;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
index 6ba10fe..c4f1f59 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/GatewayEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.workspacecatalog;
import javax.persistence.*;
@Entity
-@Table(name="GATEWAY")
+@Table(name="WORKSPACE_GATEWAY")
public class GatewayEntity {
private String gatewayId;
private String gatewayName;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
index 4f7aa7a..0bcbafa 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NSFDemographicsEntity.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name = "NSF_DEMOGRAPHIC")
+@Table(name = "WORKSPACE_NSF_DEMOGRAPHIC")
public class NSFDemographicsEntity {
private String airavataInternalUserId;
private String gender;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
index 5a0805c..67f8af2 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/NotificationEntity.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.core.entities.workspacecatalog;
import javax.persistence.*;
@Entity
-@Table(name = "NOTIFICATION")
+@Table(name = "WORKSPACE_NOTIFICATION")
public class NotificationEntity {
private String notificationId;
private String gatewayId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
index 2cfdd04..31e0868 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/ProjectEntity.java
@@ -26,7 +26,7 @@ import javax.persistence.Id;
import javax.persistence.Table;
@Entity
-@Table(name = "PROJECT")
+@Table(name = "WORKSPACE_PROJECT")
public class ProjectEntity {
private String projectID;
private String owner;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
index 11f6e33..7dd51ed 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/workspacecatalog/UserProfileEntity.java
@@ -24,7 +24,7 @@ import javax.persistence.*;
import java.util.List;
@Entity
-@Table(name="USER_PROFILE")
+@Table(name="WORKSPACE_USER_PROFILE")
public class UserProfileEntity {
private String airavataInternalUserId;
private String userId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
index 5a52dff..d30b1de 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepository.java
@@ -77,6 +77,15 @@ public class ExperimentRepository extends AbstractRepository<ExperimentModel, Ex
process.getProcessError().forEach(processErr->processErr.setProcessId(processId));
if(process.getProcessStatus() != null)
process.getProcessStatus().forEach(processStat->processStat.setProcessId(processId));
+
+ if(process.getTasks() != null){
+ process.getTasks().forEach(task->{
+ String taskId = task.getTaskId();
+ task.setParentProcessId(processId);
+
+
+ });
+ }
});
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
index 8367f97..ac9a08f 100644
--- a/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry-refactoring/src/main/resources/META-INF/persistence.xml
@@ -40,6 +40,11 @@
<class>org.apache.airavata.registry.core.entities.expcatalog.ProcessOutputEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ProcessResourceSchedulingEntity</class>
<class>org.apache.airavata.registry.core.entities.expcatalog.ProcessStatusEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.TaskEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.TaskErrorEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.TaskStatusEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.JobEntity</class>
+ <class>org.apache.airavata.registry.core.entities.expcatalog.JobStatusEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
index 8c11027..3140cd1 100644
--- a/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
+++ b/modules/registry-refactoring/src/main/resources/experiment_catalog.sql
@@ -1,10 +1,10 @@
-CREATE TABLE IF NOT EXISTS EXPERIMENT(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT(
EXPERIMENT_ID VARCHAR (255),
PROJECT_ID VARCHAR (255),
GATEWAY_ID VARCHAR (255),
EXPERIMENT_TYPE VARCHAR (255),
- USER_ID VARCHAR (255),
+ USER_NAME VARCHAR (255),
EXPERIMENT_NAME VARCHAR (255),
CREATION_TIME BIGINT,
DESCRIPTION VARCHAR (255),
@@ -13,19 +13,19 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT(
GATEWAY_INSTANCE_ID VARCHAR (255),
ENABLE_EMAIL_NOTIFICATION TINYINT(1),
PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE,
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
- FOREIGN KEY (USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROJECT_ID) REFERENCES WORKSPACE_PROJECT(PROJECT_ID) ON DELETE CASCADE,
+ FOREIGN KEY (GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
+ FOREIGN KEY (USER_NAME) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_EMAIL (
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_EMAIL (
EXPERIMENT_ID VARCHAR (255),
EMAIL VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID, EMAIL),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_CONFIGURATION(
+CREATE TABLE IF NOT EXISTS EXPCAT_USER_CONFIGURATION(
EXPERIMENT_ID VARCHAR (255),
AIRAVATA_AUTO_SCHEDULE TINYINT(1),
OVERRIDE_MANUAL_SCHEDULED_PARAMS TINYINT(1),
@@ -35,10 +35,10 @@ CREATE TABLE IF NOT EXISTS USER_CONFIGURATION(
STORAGE_ID VARCHAR (255),
EXPERIMENT_DATA_DIR VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING(
+CREATE TABLE IF NOT EXISTS EXPCAT_COMPUTE_RESOURCE_SCHEDULING(
EXPERIMENT_ID VARCHAR (255),
RESOURCE_HOST_ID VARCHAR (255),
CPU_COUNT INT,
@@ -53,10 +53,10 @@ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING(
OVERRIDE_SCRATCH_LOCATION VARCHAR (255),
OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES USER_CONFIGURATION(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_USER_CONFIGURATION(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_INPUT(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_INPUT(
EXPERIMENT_ID VARCHAR (255),
INPUT_NAME VARCHAR (255),
INPUT_VALUE VARCHAR (255),
@@ -71,10 +71,10 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_INPUT(
DATA_STAGED TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID,INPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_OUTPUT(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_OUTPUT(
EXPERIMENT_ID VARCHAR (255),
OUTPUT_NAME VARCHAR (255),
OUTPUT_VALUE VARCHAR (255),
@@ -88,10 +88,10 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_OUTPUT(
OUTPUT_STREAMING TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID,OUTPUT_NAME),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_ERROR(
ERROR_ID VARCHAR (255),
EXPERIMENT_ID VARCHAR (255),
CREATION_TIME BIGINT,
@@ -99,26 +99,26 @@ CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR(
USER_FRIENDLY_MESSAGE VARCHAR (255),
TRANSIENT_OR_PERSISTENT TINYINT,
PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID(
ERROR_ID VARCHAR (255),
ROOT_CAUSE_ERROR_ID VARCHAR (255),
PRIMARY KEY (ERROR_ID, ROOT_CAUSE_ERROR_ID),
- FOREIGN KEY(ERROR_ID) REFERENCES EXPERIMENT_ERROR(ERROR_ID) ON DELETE CASCADE
+ FOREIGN KEY(ERROR_ID) REFERENCES EXPCAT_EXPERIMENT_ERROR(ERROR_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS EXPERIMENT_STATUS(
+CREATE TABLE IF NOT EXISTS EXPCAT_EXPERIMENT_STATUS(
EXPERIMENT_ID VARCHAR (255),
STATE VARCHAR (255),
TIME_OF_STATE_CHANGE BIGINT,
REASON VARCHAR (255),
PRIMARY KEY (EXPERIMENT_ID, STATE),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS(
PROCESS_ID VARCHAR (255),
EXPERIMENT_ID VARCHAR (255),
CREATION_TIME BIGINT,
@@ -136,17 +136,17 @@ CREATE TABLE IF NOT EXISTS PROCESS(
EXPERIMENT_DATA_DIR VARCHAR (255),
USER_NAME VARCHAR (255),
PRIMARY KEY (PROCESS_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPCAT_EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_EMAIL (
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_EMAIL (
PROCESS_ID VARCHAR (255),
EMAIL VARCHAR (255),
PRIMARY KEY (PROCESS_ID, EMAIL),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_RESOURCE_SCHEDULING(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_RESOURCE_SCHEDULING(
PROCESS_ID VARCHAR (255),
RESOURCE_HOST_ID VARCHAR (255),
CPU_COUNT INT,
@@ -161,10 +161,10 @@ CREATE TABLE IF NOT EXISTS PROCESS_RESOURCE_SCHEDULING(
OVERRIDE_SCRATCH_LOCATION VARCHAR (255),
OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR (255),
PRIMARY KEY (PROCESS_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_INPUT(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_INPUT(
PROCESS_ID VARCHAR (255),
INPUT_NAME VARCHAR (255),
INPUT_VALUE VARCHAR (255),
@@ -179,10 +179,10 @@ CREATE TABLE IF NOT EXISTS PROCESS_INPUT(
DATA_STAGED TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (PROCESS_ID,INPUT_NAME),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_OUTPUT(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_OUTPUT(
PROCESS_ID VARCHAR (255),
OUTPUT_NAME VARCHAR (255),
OUTPUT_VALUE VARCHAR (255),
@@ -196,10 +196,10 @@ CREATE TABLE IF NOT EXISTS PROCESS_OUTPUT(
OUTPUT_STREAMING TINYINT(1),
STORAGE_RESOURCE_ID VARCHAR (255),
PRIMARY KEY (PROCESS_ID,OUTPUT_NAME),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_ERROR(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_ERROR(
ERROR_ID VARCHAR (255),
PROCESS_ID VARCHAR (255),
CREATION_TIME BIGINT,
@@ -207,21 +207,79 @@ CREATE TABLE IF NOT EXISTS PROCESS_ERROR(
USER_FRIENDLY_MESSAGE VARCHAR (255),
TRANSIENT_OR_PERSISTENT TINYINT,
PRIMARY KEY (ERROR_ID, PROCESS_ID),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_ERROR_ROOT_CAUSE_ERROR_ID(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_ERROR_ROOT_CAUSE_ERROR_ID(
ERROR_ID VARCHAR (255),
ROOT_CAUSE_ERROR_ID VARCHAR (255),
PRIMARY KEY (ERROR_ID, ROOT_CAUSE_ERROR_ID),
- FOREIGN KEY(ERROR_ID) REFERENCES PROCESS_ERROR(ERROR_ID) ON DELETE CASCADE
+ FOREIGN KEY(ERROR_ID) REFERENCES EXPCAT_PROCESS_ERROR(ERROR_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROCESS_STATUS(
+CREATE TABLE IF NOT EXISTS EXPCAT_PROCESS_STATUS(
PROCESS_ID VARCHAR (255),
STATE VARCHAR (255),
TIME_OF_STATE_CHANGE BIGINT,
REASON VARCHAR (255),
PRIMARY KEY (PROCESS_ID, STATE),
- FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+ FOREIGN KEY (PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS EXPCAT_TASK(
+ TASK_ID VARCHAR (255),
+ TASK_TYPE VARCHAR (255),
+ PARENT_PROCESS_ID VARCHAR (255),
+ CREATION_TIME BIGINT,
+ LAST_UPDATE_TIME BIGINT,
+ TASK_DETAIL VARCHAR (255),
+ SUB_TASK_MODEL BLOB,
+ PRIMARY KEY (TASK_ID),
+ FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID)
+);
+
+CREATE TABLE IF NOT EXISTS EXPCAT_TASK_ERROR(
+ ERROR_ID VARCHAR (255),
+ TASK_ID VARCHAR (255),
+ CREATION_TIME BIGINT,
+ ACTUAL_ERROR_MESSAGE VARCHAR (255),
+ USER_FRIENDLY_MESSAGE VARCHAR (255),
+ TRANSIENT_OR_PERSISTENT TINYINT,
+ PRIMARY KEY (ERROR_ID, TASK_ID),
+ FOREIGN KEY (TASK_ID) REFERENCES EXPCAT_TASK(TASK_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS EXPCAT_TASK_STATUS(
+ TASK_ID VARCHAR (255),
+ STATE VARCHAR (255),
+ TIME_OF_STATE_CHANGE BIGINT,
+ REASON VARCHAR (255),
+ PRIMARY KEY (TASK_ID, STATE),
+ FOREIGN KEY (TASK_ID) REFERENCES EXPCAT_TASK(TASK_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS EXPCAT_JOB(
+ JOB_ID VARCHAR (255),
+ TASK_ID VARCHAR (255),
+ PROCESS_ID VARCHAR (255),
+ JOB_DESCRIPTION VARCHAR (255),
+ CREATION_TIME BIGINT,
+ COMPUTE_RESOURCE_CONSUMED VARCHAR (255),
+ JOB_NAME VARCHAR (255),
+ WORKING_DIR VARCHAR (255),
+ STDOUT TEXT,
+ STDERR TEXT,
+ EXIT_CODE INT(11),
+ PRIMARY KEY(JOB_ID),
+ FOREIGN KEY(TASK_ID) REFERENCES EXPCAT_TASK(TASK_ID),
+ FOREIGN KEY(PROCESS_ID) REFERENCES EXPCAT_PROCESS(PROCESS_ID)
+);
+
+CREATE TABLE IF NOT EXISTS EXPCAT_JOB_STATUS(
+ JOB_ID VARCHAR (255),
+ STATE VARCHAR (255),
+ TIME_OF_STATE_CHANGE BIGINT,
+ REASON VARCHAR (255),
+ PRIMARY KEY (JOB_ID, STATE),
+ FOREIGN KEY (JOB_ID) REFERENCES EXPCAT_JOB(JOB_ID) ON DELETE CASCADE
);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/eee49d36/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql b/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
index 8b87bc2..debdba4 100644
--- a/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
+++ b/modules/registry-refactoring/src/main/resources/workspace_catalog.sql
@@ -1,5 +1,5 @@
-CREATE TABLE IF NOT EXISTS GATEWAY(
+CREATE TABLE IF NOT EXISTS WORKSPACE_GATEWAY(
GATEWAY_ID VARCHAR (255),
GATEWAY_NAME VARCHAR (255),
GATEWAY_DOMAIN VARCHAR (255),
@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS GATEWAY(
PRIMARY KEY (GATEWAY_ID)
);
-CREATE TABLE IF NOT EXISTS NOTIFICATION (
+CREATE TABLE IF NOT EXISTS WORKSPACE_NOTIFICATION (
NOTIFICATION_ID VARCHAR (255),
GATEWAY_ID VARCHAR (255),
TITLE VARCHAR (255),
@@ -32,10 +32,10 @@ CREATE TABLE IF NOT EXISTS NOTIFICATION (
EXPIRATION_TIME BIGINT,
PRIORITY VARCHAR (255),
PRIMARY KEY (NOTIFICATION_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
+ FOREIGN KEY (GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_PROFILE (
+CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
USER_ID VARCHAR (255),
GATEWAY_ID VARCHAR (255),
@@ -53,66 +53,66 @@ CREATE TABLE IF NOT EXISTS USER_PROFILE (
GPG_KEY VARCHAR (8192),
TIME_ZONE VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
+ FOREIGN KEY (GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_PROFILE_EMAIL (
+CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_EMAIL (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
EMAIL VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, EMAIL),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_PROFILE_PHONE (
+CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_PHONE (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
PHONE VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, PHONE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_PROFILE_NATIONALITY (
+CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_NATIONALITY (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
NATIONALITY VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, NATIONALITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS USER_PROFILE_LABELED_URI (
+CREATE TABLE IF NOT EXISTS WORKSPACE_USER_PROFILE_LABELED_URI (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
LABELED_URI VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, LABELED_URI ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC (
+CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
GENDER VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_ETHNICITY (
+CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_ETHNICITY (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
ETHNICITY VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, ETHNICITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_RACE (
+CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_RACE (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
RACE VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, RACE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_DISABILITY (
+CREATE TABLE IF NOT EXISTS WORKSPACE_NSF_DEMOGRAPHIC_DISABILITY (
AIRAVATA_INTERNAL_USER_ID VARCHAR (255),
DISABILITY VARCHAR (255),
PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, DISABILITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES WORKSPACE_NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
);
-CREATE TABLE IF NOT EXISTS PROJECT(
+CREATE TABLE IF NOT EXISTS WORKSPACE_PROJECT(
PROJECT_ID VARCHAR (255),
OWNER VARCHAR (255),
GATEWAY_ID VARCHAR (255),
@@ -120,6 +120,6 @@ CREATE TABLE IF NOT EXISTS PROJECT(
DESCRIPTION VARCHAR (255),
CREATION_TIME BIGINT,
PRIMARY KEY (PROJECT_ID),
- FOREIGN KEY(OWNER) REFERENCES USER_PROFILE(AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY(GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
+ FOREIGN KEY(OWNER) REFERENCES WORKSPACE_USER_PROFILE(AIRAVATA_INTERNAL_USER_ID),
+ FOREIGN KEY(GATEWAY_ID) REFERENCES WORKSPACE_GATEWAY(GATEWAY_ID) ON DELETE CASCADE
);
\ No newline at end of file
[04/10] airavata git commit: adding process model classes
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/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 158edb0..471d7c5 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
@@ -68,17 +68,17 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", 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 LAST_UPDATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastUpdateTime", org.apache.thrift.protocol.TType.I64, (short)4);
- private static final org.apache.thrift.protocol.TField PROCESS_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("processStatus", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+ private static final org.apache.thrift.protocol.TField PROCESS_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("processStatus", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final org.apache.thrift.protocol.TField PROCESS_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("processDetail", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)9);
private static final org.apache.thrift.protocol.TField PROCESS_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("processInputs", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final org.apache.thrift.protocol.TField PROCESS_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("processOutputs", org.apache.thrift.protocol.TType.LIST, (short)11);
- private static final org.apache.thrift.protocol.TField RESOURCE_SCHEDULE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSchedule", org.apache.thrift.protocol.TType.STRUCT, (short)12);
+ private static final org.apache.thrift.protocol.TField PROCESS_RESOURCE_SCHEDULE_FIELD_DESC = new org.apache.thrift.protocol.TField("processResourceSchedule", org.apache.thrift.protocol.TType.STRUCT, (short)12);
private static final org.apache.thrift.protocol.TField TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("tasks", org.apache.thrift.protocol.TType.LIST, (short)13);
private static final org.apache.thrift.protocol.TField TASK_DAG_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDag", org.apache.thrift.protocol.TType.STRING, (short)14);
- private static final org.apache.thrift.protocol.TField PROCESS_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("processError", org.apache.thrift.protocol.TType.STRUCT, (short)15);
+ private static final org.apache.thrift.protocol.TField PROCESS_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("processError", org.apache.thrift.protocol.TType.LIST, (short)15);
private static final org.apache.thrift.protocol.TField GATEWAY_EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayExecutionId", org.apache.thrift.protocol.TType.STRING, (short)16);
private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)17);
private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)18);
@@ -98,17 +98,17 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private String experimentId; // required
private long creationTime; // optional
private long lastUpdateTime; // optional
- private org.apache.airavata.model.status.ProcessStatus processStatus; // optional
+ private List<org.apache.airavata.model.status.ProcessStatus> processStatus; // optional
private String processDetail; // optional
private String applicationInterfaceId; // optional
private String applicationDeploymentId; // optional
private String computeResourceId; // optional
private List<org.apache.airavata.model.application.io.InputDataObjectType> processInputs; // optional
private List<org.apache.airavata.model.application.io.OutputDataObjectType> processOutputs; // optional
- private org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel resourceSchedule; // optional
+ private org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel processResourceSchedule; // optional
private List<org.apache.airavata.model.task.TaskModel> tasks; // optional
private String taskDag; // optional
- private org.apache.airavata.model.commons.ErrorModel processError; // optional
+ private List<org.apache.airavata.model.commons.ErrorModel> processError; // optional
private String gatewayExecutionId; // optional
private boolean enableEmailNotification; // optional
private List<String> emailAddresses; // optional
@@ -131,7 +131,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
COMPUTE_RESOURCE_ID((short)9, "computeResourceId"),
PROCESS_INPUTS((short)10, "processInputs"),
PROCESS_OUTPUTS((short)11, "processOutputs"),
- RESOURCE_SCHEDULE((short)12, "resourceSchedule"),
+ PROCESS_RESOURCE_SCHEDULE((short)12, "processResourceSchedule"),
TASKS((short)13, "tasks"),
TASK_DAG((short)14, "taskDag"),
PROCESS_ERROR((short)15, "processError"),
@@ -179,8 +179,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return PROCESS_INPUTS;
case 11: // PROCESS_OUTPUTS
return PROCESS_OUTPUTS;
- case 12: // RESOURCE_SCHEDULE
- return RESOURCE_SCHEDULE;
+ case 12: // PROCESS_RESOURCE_SCHEDULE
+ return PROCESS_RESOURCE_SCHEDULE;
case 13: // TASKS
return TASKS;
case 14: // TASK_DAG
@@ -248,7 +248,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 2;
private static final int __GENERATECERT_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.LAST_UPDATE_TIME,_Fields.PROCESS_STATUS,_Fields.PROCESS_DETAIL,_Fields.APPLICATION_INTERFACE_ID,_Fields.APPLICATION_DEPLOYMENT_ID,_Fields.COMPUTE_RESOURCE_ID,_Fields.PROCESS_INPUTS,_Fields.PROCESS_OUTPUTS,_Fields.RESOURCE_SCHEDULE,_Fields.TASKS,_Fields.TASK_DAG,_Fields.PROCESS_ERROR,_Fields.GATEWAY_EXECUTION_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.STORAGE_RESOURCE_ID,_Fields.USER_DN,_Fields.GENERATE_CERT,_Fields.EXPERIMENT_DATA_DIR,_Fields.USER_NAME};
+ private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.LAST_UPDATE_TIME,_Fields.PROCESS_STATUS,_Fields.PROCESS_DETAIL,_Fields.APPLICATION_INTERFACE_ID,_Fields.APPLICATION_DEPLOYMENT_ID,_Fields.COMPUTE_RESOURCE_ID,_Fields.PROCESS_INPUTS,_Fields.PROCESS_OUTPUTS,_Fields.PROCESS_RESOURCE_SCHEDULE,_Fields.TASKS,_Fields.TASK_DAG,_Fields.PROCESS_ERROR,_Fields.GATEWAY_EXECUTION_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.STORAGE_RESOURCE_ID,_Fields.USER_DN,_Fields.GENERATE_CERT,_Fields.EXPERIMENT_DATA_DIR,_Fields.USER_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -261,7 +261,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
tmpMap.put(_Fields.LAST_UPDATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastUpdateTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.PROCESS_STATUS, new org.apache.thrift.meta_data.FieldMetaData("processStatus", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.ProcessStatus.class)));
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.status.ProcessStatus.class))));
tmpMap.put(_Fields.PROCESS_DETAIL, new org.apache.thrift.meta_data.FieldMetaData("processDetail", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -276,7 +277,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
tmpMap.put(_Fields.PROCESS_OUTPUTS, new org.apache.thrift.meta_data.FieldMetaData("processOutputs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.application.io.OutputDataObjectType.class))));
- tmpMap.put(_Fields.RESOURCE_SCHEDULE, new org.apache.thrift.meta_data.FieldMetaData("resourceSchedule", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.PROCESS_RESOURCE_SCHEDULE, new org.apache.thrift.meta_data.FieldMetaData("processResourceSchedule", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel.class)));
tmpMap.put(_Fields.TASKS, new org.apache.thrift.meta_data.FieldMetaData("tasks", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
@@ -284,7 +285,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
tmpMap.put(_Fields.TASK_DAG, new org.apache.thrift.meta_data.FieldMetaData("taskDag", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PROCESS_ERROR, new org.apache.thrift.meta_data.FieldMetaData("processError", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class)));
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
tmpMap.put(_Fields.GATEWAY_EXECUTION_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayExecutionId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ENABLE_EMAIL_NOTIFICATION, new org.apache.thrift.meta_data.FieldMetaData("enableEmailNotification", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -336,7 +338,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.creationTime = other.creationTime;
this.lastUpdateTime = other.lastUpdateTime;
if (other.isSetProcessStatus()) {
- this.processStatus = new org.apache.airavata.model.status.ProcessStatus(other.processStatus);
+ List<org.apache.airavata.model.status.ProcessStatus> __this__processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(other.processStatus.size());
+ for (org.apache.airavata.model.status.ProcessStatus other_element : other.processStatus) {
+ __this__processStatus.add(new org.apache.airavata.model.status.ProcessStatus(other_element));
+ }
+ this.processStatus = __this__processStatus;
}
if (other.isSetProcessDetail()) {
this.processDetail = other.processDetail;
@@ -364,8 +370,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
this.processOutputs = __this__processOutputs;
}
- if (other.isSetResourceSchedule()) {
- this.resourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel(other.resourceSchedule);
+ if (other.isSetProcessResourceSchedule()) {
+ this.processResourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel(other.processResourceSchedule);
}
if (other.isSetTasks()) {
List<org.apache.airavata.model.task.TaskModel> __this__tasks = new ArrayList<org.apache.airavata.model.task.TaskModel>(other.tasks.size());
@@ -378,7 +384,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.taskDag = other.taskDag;
}
if (other.isSetProcessError()) {
- this.processError = new org.apache.airavata.model.commons.ErrorModel(other.processError);
+ List<org.apache.airavata.model.commons.ErrorModel> __this__processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.processError.size());
+ for (org.apache.airavata.model.commons.ErrorModel other_element : other.processError) {
+ __this__processError.add(new org.apache.airavata.model.commons.ErrorModel(other_element));
+ }
+ this.processError = __this__processError;
}
if (other.isSetGatewayExecutionId()) {
this.gatewayExecutionId = other.gatewayExecutionId;
@@ -423,7 +433,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.computeResourceId = null;
this.processInputs = null;
this.processOutputs = null;
- this.resourceSchedule = null;
+ this.processResourceSchedule = null;
this.tasks = null;
this.taskDag = null;
this.processError = null;
@@ -529,11 +539,26 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTUPDATETIME_ISSET_ID, value);
}
- public org.apache.airavata.model.status.ProcessStatus getProcessStatus() {
+ public int getProcessStatusSize() {
+ return (this.processStatus == null) ? 0 : this.processStatus.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.status.ProcessStatus> getProcessStatusIterator() {
+ return (this.processStatus == null) ? null : this.processStatus.iterator();
+ }
+
+ public void addToProcessStatus(org.apache.airavata.model.status.ProcessStatus elem) {
+ if (this.processStatus == null) {
+ this.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>();
+ }
+ this.processStatus.add(elem);
+ }
+
+ public List<org.apache.airavata.model.status.ProcessStatus> getProcessStatus() {
return this.processStatus;
}
- public void setProcessStatus(org.apache.airavata.model.status.ProcessStatus processStatus) {
+ public void setProcessStatus(List<org.apache.airavata.model.status.ProcessStatus> processStatus) {
this.processStatus = processStatus;
}
@@ -720,26 +745,26 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
}
- public org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel getResourceSchedule() {
- return this.resourceSchedule;
+ public org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel getProcessResourceSchedule() {
+ return this.processResourceSchedule;
}
- public void setResourceSchedule(org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel resourceSchedule) {
- this.resourceSchedule = resourceSchedule;
+ public void setProcessResourceSchedule(org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel processResourceSchedule) {
+ this.processResourceSchedule = processResourceSchedule;
}
- public void unsetResourceSchedule() {
- this.resourceSchedule = null;
+ public void unsetProcessResourceSchedule() {
+ this.processResourceSchedule = null;
}
- /** Returns true if field resourceSchedule is set (has been assigned a value) and false otherwise */
- public boolean isSetResourceSchedule() {
- return this.resourceSchedule != null;
+ /** Returns true if field processResourceSchedule is set (has been assigned a value) and false otherwise */
+ public boolean isSetProcessResourceSchedule() {
+ return this.processResourceSchedule != null;
}
- public void setResourceScheduleIsSet(boolean value) {
+ public void setProcessResourceScheduleIsSet(boolean value) {
if (!value) {
- this.resourceSchedule = null;
+ this.processResourceSchedule = null;
}
}
@@ -804,11 +829,26 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
}
- public org.apache.airavata.model.commons.ErrorModel getProcessError() {
+ public int getProcessErrorSize() {
+ return (this.processError == null) ? 0 : this.processError.size();
+ }
+
+ public java.util.Iterator<org.apache.airavata.model.commons.ErrorModel> getProcessErrorIterator() {
+ return (this.processError == null) ? null : this.processError.iterator();
+ }
+
+ public void addToProcessError(org.apache.airavata.model.commons.ErrorModel elem) {
+ if (this.processError == null) {
+ this.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>();
+ }
+ this.processError.add(elem);
+ }
+
+ public List<org.apache.airavata.model.commons.ErrorModel> getProcessError() {
return this.processError;
}
- public void setProcessError(org.apache.airavata.model.commons.ErrorModel processError) {
+ public void setProcessError(List<org.apache.airavata.model.commons.ErrorModel> processError) {
this.processError = processError;
}
@@ -1062,7 +1102,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (value == null) {
unsetProcessStatus();
} else {
- setProcessStatus((org.apache.airavata.model.status.ProcessStatus)value);
+ setProcessStatus((List<org.apache.airavata.model.status.ProcessStatus>)value);
}
break;
@@ -1114,11 +1154,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
break;
- case RESOURCE_SCHEDULE:
+ case PROCESS_RESOURCE_SCHEDULE:
if (value == null) {
- unsetResourceSchedule();
+ unsetProcessResourceSchedule();
} else {
- setResourceSchedule((org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel)value);
+ setProcessResourceSchedule((org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel)value);
}
break;
@@ -1142,7 +1182,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (value == null) {
unsetProcessError();
} else {
- setProcessError((org.apache.airavata.model.commons.ErrorModel)value);
+ setProcessError((List<org.apache.airavata.model.commons.ErrorModel>)value);
}
break;
@@ -1248,8 +1288,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case PROCESS_OUTPUTS:
return getProcessOutputs();
- case RESOURCE_SCHEDULE:
- return getResourceSchedule();
+ case PROCESS_RESOURCE_SCHEDULE:
+ return getProcessResourceSchedule();
case TASKS:
return getTasks();
@@ -1317,8 +1357,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return isSetProcessInputs();
case PROCESS_OUTPUTS:
return isSetProcessOutputs();
- case RESOURCE_SCHEDULE:
- return isSetResourceSchedule();
+ case PROCESS_RESOURCE_SCHEDULE:
+ return isSetProcessResourceSchedule();
case TASKS:
return isSetTasks();
case TASK_DAG:
@@ -1457,12 +1497,12 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return false;
}
- boolean this_present_resourceSchedule = true && this.isSetResourceSchedule();
- boolean that_present_resourceSchedule = true && that.isSetResourceSchedule();
- if (this_present_resourceSchedule || that_present_resourceSchedule) {
- if (!(this_present_resourceSchedule && that_present_resourceSchedule))
+ boolean this_present_processResourceSchedule = true && this.isSetProcessResourceSchedule();
+ boolean that_present_processResourceSchedule = true && that.isSetProcessResourceSchedule();
+ if (this_present_processResourceSchedule || that_present_processResourceSchedule) {
+ if (!(this_present_processResourceSchedule && that_present_processResourceSchedule))
return false;
- if (!this.resourceSchedule.equals(that.resourceSchedule))
+ if (!this.processResourceSchedule.equals(that.processResourceSchedule))
return false;
}
@@ -1627,10 +1667,10 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (present_processOutputs)
list.add(processOutputs);
- boolean present_resourceSchedule = true && (isSetResourceSchedule());
- list.add(present_resourceSchedule);
- if (present_resourceSchedule)
- list.add(resourceSchedule);
+ boolean present_processResourceSchedule = true && (isSetProcessResourceSchedule());
+ list.add(present_processResourceSchedule);
+ if (present_processResourceSchedule)
+ list.add(processResourceSchedule);
boolean present_tasks = true && (isSetTasks());
list.add(present_tasks);
@@ -1808,12 +1848,12 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetResourceSchedule()).compareTo(other.isSetResourceSchedule());
+ lastComparison = Boolean.valueOf(isSetProcessResourceSchedule()).compareTo(other.isSetProcessResourceSchedule());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetResourceSchedule()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceSchedule, other.resourceSchedule);
+ if (isSetProcessResourceSchedule()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.processResourceSchedule, other.processResourceSchedule);
if (lastComparison != 0) {
return lastComparison;
}
@@ -2045,13 +2085,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
first = false;
}
- if (isSetResourceSchedule()) {
+ if (isSetProcessResourceSchedule()) {
if (!first) sb.append(", ");
- sb.append("resourceSchedule:");
- if (this.resourceSchedule == null) {
+ sb.append("processResourceSchedule:");
+ if (this.processResourceSchedule == null) {
sb.append("null");
} else {
- sb.append(this.resourceSchedule);
+ sb.append(this.processResourceSchedule);
}
first = false;
}
@@ -2172,14 +2212,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
// check for sub-struct validity
- if (processStatus != null) {
- processStatus.validate();
- }
- if (resourceSchedule != null) {
- resourceSchedule.validate();
- }
- if (processError != null) {
- processError.validate();
+ if (processResourceSchedule != null) {
+ processResourceSchedule.validate();
}
}
@@ -2252,9 +2286,19 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
break;
case 5: // PROCESS_STATUS
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.processStatus = new org.apache.airavata.model.status.ProcessStatus();
- struct.processStatus.read(iprot);
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list0.size);
+ org.apache.airavata.model.status.ProcessStatus _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new org.apache.airavata.model.status.ProcessStatus();
+ _elem1.read(iprot);
+ struct.processStatus.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
struct.setProcessStatusIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -2295,14 +2339,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case 10: // PROCESS_INPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.processInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list0.size);
- org.apache.airavata.model.application.io.InputDataObjectType _elem1;
- for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
+ struct.processInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list3.size);
+ org.apache.airavata.model.application.io.InputDataObjectType _elem4;
+ for (int _i5 = 0; _i5 < _list3.size; ++_i5)
{
- _elem1 = new org.apache.airavata.model.application.io.InputDataObjectType();
- _elem1.read(iprot);
- struct.processInputs.add(_elem1);
+ _elem4 = new org.apache.airavata.model.application.io.InputDataObjectType();
+ _elem4.read(iprot);
+ struct.processInputs.add(_elem4);
}
iprot.readListEnd();
}
@@ -2314,14 +2358,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case 11: // PROCESS_OUTPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
- struct.processOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list3.size);
- org.apache.airavata.model.application.io.OutputDataObjectType _elem4;
- for (int _i5 = 0; _i5 < _list3.size; ++_i5)
+ org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
+ struct.processOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list6.size);
+ org.apache.airavata.model.application.io.OutputDataObjectType _elem7;
+ for (int _i8 = 0; _i8 < _list6.size; ++_i8)
{
- _elem4 = new org.apache.airavata.model.application.io.OutputDataObjectType();
- _elem4.read(iprot);
- struct.processOutputs.add(_elem4);
+ _elem7 = new org.apache.airavata.model.application.io.OutputDataObjectType();
+ _elem7.read(iprot);
+ struct.processOutputs.add(_elem7);
}
iprot.readListEnd();
}
@@ -2330,11 +2374,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // RESOURCE_SCHEDULE
+ case 12: // PROCESS_RESOURCE_SCHEDULE
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.resourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel();
- struct.resourceSchedule.read(iprot);
- struct.setResourceScheduleIsSet(true);
+ struct.processResourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel();
+ struct.processResourceSchedule.read(iprot);
+ struct.setProcessResourceScheduleIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2342,14 +2386,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case 13: // TASKS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
- struct.tasks = new ArrayList<org.apache.airavata.model.task.TaskModel>(_list6.size);
- org.apache.airavata.model.task.TaskModel _elem7;
- for (int _i8 = 0; _i8 < _list6.size; ++_i8)
+ org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
+ struct.tasks = new ArrayList<org.apache.airavata.model.task.TaskModel>(_list9.size);
+ org.apache.airavata.model.task.TaskModel _elem10;
+ for (int _i11 = 0; _i11 < _list9.size; ++_i11)
{
- _elem7 = new org.apache.airavata.model.task.TaskModel();
- _elem7.read(iprot);
- struct.tasks.add(_elem7);
+ _elem10 = new org.apache.airavata.model.task.TaskModel();
+ _elem10.read(iprot);
+ struct.tasks.add(_elem10);
}
iprot.readListEnd();
}
@@ -2367,9 +2411,19 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
break;
case 15: // PROCESS_ERROR
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.processError = new org.apache.airavata.model.commons.ErrorModel();
- struct.processError.read(iprot);
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
+ struct.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list12.size);
+ org.apache.airavata.model.commons.ErrorModel _elem13;
+ for (int _i14 = 0; _i14 < _list12.size; ++_i14)
+ {
+ _elem13 = new org.apache.airavata.model.commons.ErrorModel();
+ _elem13.read(iprot);
+ struct.processError.add(_elem13);
+ }
+ iprot.readListEnd();
+ }
struct.setProcessErrorIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -2394,13 +2448,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case 18: // EMAIL_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
- struct.emailAddresses = new ArrayList<String>(_list9.size);
- String _elem10;
- for (int _i11 = 0; _i11 < _list9.size; ++_i11)
+ org.apache.thrift.protocol.TList _list15 = iprot.readListBegin();
+ struct.emailAddresses = new ArrayList<String>(_list15.size);
+ String _elem16;
+ for (int _i17 = 0; _i17 < _list15.size; ++_i17)
{
- _elem10 = iprot.readString();
- struct.emailAddresses.add(_elem10);
+ _elem16 = iprot.readString();
+ struct.emailAddresses.add(_elem16);
}
iprot.readListEnd();
}
@@ -2485,7 +2539,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.processStatus != null) {
if (struct.isSetProcessStatus()) {
oprot.writeFieldBegin(PROCESS_STATUS_FIELD_DESC);
- struct.processStatus.write(oprot);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processStatus.size()));
+ for (org.apache.airavata.model.status.ProcessStatus _iter18 : struct.processStatus)
+ {
+ _iter18.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
}
@@ -2522,9 +2583,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldBegin(PROCESS_INPUTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processInputs.size()));
- for (org.apache.airavata.model.application.io.InputDataObjectType _iter12 : struct.processInputs)
+ for (org.apache.airavata.model.application.io.InputDataObjectType _iter19 : struct.processInputs)
{
- _iter12.write(oprot);
+ _iter19.write(oprot);
}
oprot.writeListEnd();
}
@@ -2536,19 +2597,19 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldBegin(PROCESS_OUTPUTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processOutputs.size()));
- for (org.apache.airavata.model.application.io.OutputDataObjectType _iter13 : struct.processOutputs)
+ for (org.apache.airavata.model.application.io.OutputDataObjectType _iter20 : struct.processOutputs)
{
- _iter13.write(oprot);
+ _iter20.write(oprot);
}
oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
}
- if (struct.resourceSchedule != null) {
- if (struct.isSetResourceSchedule()) {
- oprot.writeFieldBegin(RESOURCE_SCHEDULE_FIELD_DESC);
- struct.resourceSchedule.write(oprot);
+ if (struct.processResourceSchedule != null) {
+ if (struct.isSetProcessResourceSchedule()) {
+ oprot.writeFieldBegin(PROCESS_RESOURCE_SCHEDULE_FIELD_DESC);
+ struct.processResourceSchedule.write(oprot);
oprot.writeFieldEnd();
}
}
@@ -2557,9 +2618,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldBegin(TASKS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tasks.size()));
- for (org.apache.airavata.model.task.TaskModel _iter14 : struct.tasks)
+ for (org.apache.airavata.model.task.TaskModel _iter21 : struct.tasks)
{
- _iter14.write(oprot);
+ _iter21.write(oprot);
}
oprot.writeListEnd();
}
@@ -2576,7 +2637,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.processError != null) {
if (struct.isSetProcessError()) {
oprot.writeFieldBegin(PROCESS_ERROR_FIELD_DESC);
- struct.processError.write(oprot);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.processError.size()));
+ for (org.apache.airavata.model.commons.ErrorModel _iter22 : struct.processError)
+ {
+ _iter22.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
oprot.writeFieldEnd();
}
}
@@ -2597,9 +2665,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldBegin(EMAIL_ADDRESSES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.emailAddresses.size()));
- for (String _iter15 : struct.emailAddresses)
+ for (String _iter23 : struct.emailAddresses)
{
- oprot.writeString(_iter15);
+ oprot.writeString(_iter23);
}
oprot.writeListEnd();
}
@@ -2686,7 +2754,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetProcessOutputs()) {
optionals.set(8);
}
- if (struct.isSetResourceSchedule()) {
+ if (struct.isSetProcessResourceSchedule()) {
optionals.set(9);
}
if (struct.isSetTasks()) {
@@ -2730,7 +2798,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeI64(struct.lastUpdateTime);
}
if (struct.isSetProcessStatus()) {
- struct.processStatus.write(oprot);
+ {
+ oprot.writeI32(struct.processStatus.size());
+ for (org.apache.airavata.model.status.ProcessStatus _iter24 : struct.processStatus)
+ {
+ _iter24.write(oprot);
+ }
+ }
}
if (struct.isSetProcessDetail()) {
oprot.writeString(struct.processDetail);
@@ -2747,30 +2821,30 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetProcessInputs()) {
{
oprot.writeI32(struct.processInputs.size());
- for (org.apache.airavata.model.application.io.InputDataObjectType _iter16 : struct.processInputs)
+ for (org.apache.airavata.model.application.io.InputDataObjectType _iter25 : struct.processInputs)
{
- _iter16.write(oprot);
+ _iter25.write(oprot);
}
}
}
if (struct.isSetProcessOutputs()) {
{
oprot.writeI32(struct.processOutputs.size());
- for (org.apache.airavata.model.application.io.OutputDataObjectType _iter17 : struct.processOutputs)
+ for (org.apache.airavata.model.application.io.OutputDataObjectType _iter26 : struct.processOutputs)
{
- _iter17.write(oprot);
+ _iter26.write(oprot);
}
}
}
- if (struct.isSetResourceSchedule()) {
- struct.resourceSchedule.write(oprot);
+ if (struct.isSetProcessResourceSchedule()) {
+ struct.processResourceSchedule.write(oprot);
}
if (struct.isSetTasks()) {
{
oprot.writeI32(struct.tasks.size());
- for (org.apache.airavata.model.task.TaskModel _iter18 : struct.tasks)
+ for (org.apache.airavata.model.task.TaskModel _iter27 : struct.tasks)
{
- _iter18.write(oprot);
+ _iter27.write(oprot);
}
}
}
@@ -2778,7 +2852,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeString(struct.taskDag);
}
if (struct.isSetProcessError()) {
- struct.processError.write(oprot);
+ {
+ oprot.writeI32(struct.processError.size());
+ for (org.apache.airavata.model.commons.ErrorModel _iter28 : struct.processError)
+ {
+ _iter28.write(oprot);
+ }
+ }
}
if (struct.isSetGatewayExecutionId()) {
oprot.writeString(struct.gatewayExecutionId);
@@ -2789,9 +2869,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetEmailAddresses()) {
{
oprot.writeI32(struct.emailAddresses.size());
- for (String _iter19 : struct.emailAddresses)
+ for (String _iter29 : struct.emailAddresses)
{
- oprot.writeString(_iter19);
+ oprot.writeString(_iter29);
}
}
}
@@ -2829,8 +2909,17 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
struct.setLastUpdateTimeIsSet(true);
}
if (incoming.get(2)) {
- struct.processStatus = new org.apache.airavata.model.status.ProcessStatus();
- struct.processStatus.read(iprot);
+ {
+ org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.processStatus = new ArrayList<org.apache.airavata.model.status.ProcessStatus>(_list30.size);
+ org.apache.airavata.model.status.ProcessStatus _elem31;
+ for (int _i32 = 0; _i32 < _list30.size; ++_i32)
+ {
+ _elem31 = new org.apache.airavata.model.status.ProcessStatus();
+ _elem31.read(iprot);
+ struct.processStatus.add(_elem31);
+ }
+ }
struct.setProcessStatusIsSet(true);
}
if (incoming.get(3)) {
@@ -2851,47 +2940,47 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (incoming.get(7)) {
{
- org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.processInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list20.size);
- org.apache.airavata.model.application.io.InputDataObjectType _elem21;
- for (int _i22 = 0; _i22 < _list20.size; ++_i22)
+ org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.processInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list33.size);
+ org.apache.airavata.model.application.io.InputDataObjectType _elem34;
+ for (int _i35 = 0; _i35 < _list33.size; ++_i35)
{
- _elem21 = new org.apache.airavata.model.application.io.InputDataObjectType();
- _elem21.read(iprot);
- struct.processInputs.add(_elem21);
+ _elem34 = new org.apache.airavata.model.application.io.InputDataObjectType();
+ _elem34.read(iprot);
+ struct.processInputs.add(_elem34);
}
}
struct.setProcessInputsIsSet(true);
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.processOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list23.size);
- org.apache.airavata.model.application.io.OutputDataObjectType _elem24;
- for (int _i25 = 0; _i25 < _list23.size; ++_i25)
+ org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.processOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list36.size);
+ org.apache.airavata.model.application.io.OutputDataObjectType _elem37;
+ for (int _i38 = 0; _i38 < _list36.size; ++_i38)
{
- _elem24 = new org.apache.airavata.model.application.io.OutputDataObjectType();
- _elem24.read(iprot);
- struct.processOutputs.add(_elem24);
+ _elem37 = new org.apache.airavata.model.application.io.OutputDataObjectType();
+ _elem37.read(iprot);
+ struct.processOutputs.add(_elem37);
}
}
struct.setProcessOutputsIsSet(true);
}
if (incoming.get(9)) {
- struct.resourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel();
- struct.resourceSchedule.read(iprot);
- struct.setResourceScheduleIsSet(true);
+ struct.processResourceSchedule = new org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel();
+ struct.processResourceSchedule.read(iprot);
+ struct.setProcessResourceScheduleIsSet(true);
}
if (incoming.get(10)) {
{
- org.apache.thrift.protocol.TList _list26 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.tasks = new ArrayList<org.apache.airavata.model.task.TaskModel>(_list26.size);
- org.apache.airavata.model.task.TaskModel _elem27;
- for (int _i28 = 0; _i28 < _list26.size; ++_i28)
+ org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.tasks = new ArrayList<org.apache.airavata.model.task.TaskModel>(_list39.size);
+ org.apache.airavata.model.task.TaskModel _elem40;
+ for (int _i41 = 0; _i41 < _list39.size; ++_i41)
{
- _elem27 = new org.apache.airavata.model.task.TaskModel();
- _elem27.read(iprot);
- struct.tasks.add(_elem27);
+ _elem40 = new org.apache.airavata.model.task.TaskModel();
+ _elem40.read(iprot);
+ struct.tasks.add(_elem40);
}
}
struct.setTasksIsSet(true);
@@ -2901,8 +2990,17 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
struct.setTaskDagIsSet(true);
}
if (incoming.get(12)) {
- struct.processError = new org.apache.airavata.model.commons.ErrorModel();
- struct.processError.read(iprot);
+ {
+ org.apache.thrift.protocol.TList _list42 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.processError = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list42.size);
+ org.apache.airavata.model.commons.ErrorModel _elem43;
+ for (int _i44 = 0; _i44 < _list42.size; ++_i44)
+ {
+ _elem43 = new org.apache.airavata.model.commons.ErrorModel();
+ _elem43.read(iprot);
+ struct.processError.add(_elem43);
+ }
+ }
struct.setProcessErrorIsSet(true);
}
if (incoming.get(13)) {
@@ -2915,13 +3013,13 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
if (incoming.get(15)) {
{
- org.apache.thrift.protocol.TList _list29 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.emailAddresses = new ArrayList<String>(_list29.size);
- String _elem30;
- for (int _i31 = 0; _i31 < _list29.size; ++_i31)
+ org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.emailAddresses = new ArrayList<String>(_list45.size);
+ String _elem46;
+ for (int _i47 = 0; _i47 < _list45.size; ++_i47)
{
- _elem30 = iprot.readString();
- struct.emailAddresses.add(_elem30);
+ _elem46 = iprot.readString();
+ struct.emailAddresses.add(_elem46);
}
}
struct.setEmailAddressesIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
index 321d31c..ef18235 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
@@ -23,14 +23,32 @@
*/
package org.apache.airavata.model.user;
-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"})
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
index d1b25b0..07f38e4 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
@@ -103,7 +103,7 @@ public class ExperimentModelUtil {
processModel.setUserDn(configData.getUserDN());
ComputationalResourceSchedulingModel scheduling = configData.getComputationalResourceScheduling();
if (scheduling != null){
- processModel.setResourceSchedule(scheduling);
+ processModel.setProcessResourceSchedule(scheduling);
processModel.setComputeResourceId(scheduling.getResourceHostId());
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 0ed836f..0015a21 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -449,7 +449,7 @@ public class GFacUtils {
log.error("Error while getting job submissiont sub task model", e);
}
- ComputationalResourceSchedulingModel scheduling = processModel.getResourceSchedule();
+ ComputationalResourceSchedulingModel scheduling = processModel.getProcessResourceSchedule();
if (scheduling != null) {
int totalNodeCount = scheduling.getNodeCount();
int totalCPUCount = scheduling.getTotalCPUCount();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index 4181b47..0e8c1f0 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -46,6 +46,7 @@ import org.apache.curator.framework.CuratorFramework;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -162,11 +163,11 @@ public class ProcessContext {
public String getWorkingDir() {
if (workingDir == null) {
- if (processModel.getResourceSchedule().getStaticWorkingDir() != null){
- workingDir = processModel.getResourceSchedule().getStaticWorkingDir();
+ if (processModel.getProcessResourceSchedule().getStaticWorkingDir() != null){
+ workingDir = processModel.getProcessResourceSchedule().getStaticWorkingDir();
}else {
String scratchLocation = null;
- String overrideScratchLocation = processModel.getResourceSchedule().getOverrideScratchLocation();
+ String overrideScratchLocation = processModel.getProcessResourceSchedule().getOverrideScratchLocation();
if (overrideScratchLocation != null && !overrideScratchLocation.equals("")) {
scratchLocation = overrideScratchLocation;
} else {
@@ -361,19 +362,27 @@ public class ProcessContext {
}
public ProcessState getProcessState() {
- return processModel.getProcessStatus().getState();
+ if(processModel.getProcessStatus() != null && processModel.getProcessStatus().size() > 0)
+ return processModel.getProcessStatus().get(0).getState();
+ else
+ return null;
}
public void setProcessStatus(ProcessStatus status) {
if (status != null) {
log.info("expId: {}, processId: {} :- Process status changed {} -> {}", getExperimentId(), processId,
getProcessState().name(), status.getState().name());
- processModel.setProcessStatus(status);
+ List<ProcessStatus> processStatuses = new ArrayList<>();
+ processStatuses.add(status);
+ processModel.setProcessStatus(processStatuses);
}
}
public ProcessStatus getProcessStatus(){
- return processModel.getProcessStatus();
+ if(processModel.getProcessStatus() != null)
+ return processModel.getProcessStatus().get(0);
+ else
+ return null;
}
public String getComputeResourceId() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
index 6ed6de3..4aaf93b 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java
@@ -335,7 +335,7 @@ public abstract class Factory {
try {
ProcessModel processModel = processContext.getProcessModel();
String loginUserName = null;
- String overrideLoginUserName = processModel.getResourceSchedule().getOverrideLoginUserName();
+ String overrideLoginUserName = processModel.getProcessResourceSchedule().getOverrideLoginUserName();
if (overrideLoginUserName != null && !overrideLoginUserName.equals("")) {
loginUserName = overrideLoginUserName;
} else {
@@ -352,7 +352,7 @@ public abstract class Factory {
try {
ProcessModel processModel = processContext.getProcessModel();
String scratchLocation = null;
- String overrideScratchLocation = processModel.getResourceSchedule().getOverrideScratchLocation();
+ String overrideScratchLocation = processModel.getProcessResourceSchedule().getOverrideScratchLocation();
if (overrideScratchLocation != null && !overrideScratchLocation.equals("")) {
scratchLocation = overrideScratchLocation;
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java
index da29a26..ebe3bab 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DataStreamingTask.java
@@ -76,7 +76,7 @@ public class DataStreamingTask implements Task {
if (processOutput != null) {
if (processOutput.isOutputStreaming()) {
// stream output periodically
- ComputationalResourceSchedulingModel resourceSchedule = taskContext.getParentProcessContext().getProcessModel().getResourceSchedule();
+ ComputationalResourceSchedulingModel resourceSchedule = taskContext.getParentProcessContext().getProcessModel().getProcessResourceSchedule();
int wallTimeLimit = resourceSchedule.getWallTimeLimit();
if (wallTimeLimit > 10) {
int period = wallTimeLimit / 10;
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
index d9ef7e2..d6b32e7 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
@@ -108,7 +108,7 @@ public class ApplicationProcessor {
// do nothing
}
- int totalThreadCount = context.getProcessModel().getResourceSchedule().getNumberOfThreads();
+ int totalThreadCount = context.getProcessModel().getProcessResourceSchedule().getNumberOfThreads();
// we take it as threads per processes
if(totalThreadCount > 0){
ThreadsPerProcessType tpp = ThreadsPerProcessType.Factory.newInstance();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ResourceProcessor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ResourceProcessor.java
index a5586db..ea2ccdc 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ResourceProcessor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ResourceProcessor.java
@@ -37,7 +37,7 @@ public class ResourceProcessor {
ProcessModel processModel = context.getProcessModel();
if (processModel != null) {
try {
- ComputationalResourceSchedulingModel crs = processModel.getResourceSchedule();
+ ComputationalResourceSchedulingModel crs = processModel.getProcessResourceSchedule();
if (crs.getTotalPhysicalMemory() > 0) {
RangeValueType rangeType = new RangeValueType();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index 95ff86e..74bd2db 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -124,7 +124,7 @@ public class OrchestratorUtils {
public static String getLoginUserName(OrchestratorContext context, ProcessModel processModel, String gatewayId) throws RegistryException {
try {
String loginUserName = null;
- String overrideLoginUserName = processModel.getResourceSchedule().getOverrideLoginUserName();
+ String overrideLoginUserName = processModel.getProcessResourceSchedule().getOverrideLoginUserName();
if (overrideLoginUserName != null && !overrideLoginUserName.equals("")) {
loginUserName = overrideLoginUserName;
} else {
@@ -141,7 +141,7 @@ public class OrchestratorUtils {
public static String getScratchLocation(OrchestratorContext context, ProcessModel processModel, String gatewayId) throws RegistryException {
try {
String scratchLocation = null;
- String overrideScratchLocation = processModel.getResourceSchedule().getOverrideScratchLocation();
+ String overrideScratchLocation = processModel.getProcessResourceSchedule().getOverrideScratchLocation();
if (overrideScratchLocation != null && !overrideScratchLocation.equals("")) {
scratchLocation = overrideScratchLocation;
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
index 212426d..173552e 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/BatchQueueValidator.java
@@ -82,7 +82,7 @@ public class BatchQueueValidator implements JobMetadataValidator {
if (processModel == null) {
computeResource = appCatalog.getComputeResource().getComputeResource(experiment.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId());
} else {
- computeResource = appCatalog.getComputeResource().getComputeResource(processModel.getResourceSchedule().getResourceHostId());
+ computeResource = appCatalog.getComputeResource().getComputeResource(processModel.getProcessResourceSchedule().getResourceHostId());
}
List<BatchQueue> batchQueues = computeResource.getBatchQueues();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index 3e057cb..73a6aef 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -275,7 +275,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
try {
ExperimentCatalog experimentCatalog = orchestratorContext.getRegistry().getExperimentCatalog();
AppCatalog appCatalog = orchestratorContext.getRegistry().getAppCatalog();
- ComputationalResourceSchedulingModel resourceSchedule = processModel.getResourceSchedule();
+ ComputationalResourceSchedulingModel resourceSchedule = processModel.getProcessResourceSchedule();
String userGivenQueueName = resourceSchedule.getQueueName();
int userGivenWallTime = resourceSchedule.getWallTimeLimit();
String resourceHostId = resourceSchedule.getResourceHostId();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 1a6ac25..725a0b1 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -330,7 +330,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
ApplicationDeploymentDescription applicationDeploymentDescription = getAppDeployment(processModel, applicationId);
processModel.setApplicationDeploymentId(applicationDeploymentDescription.getAppDeploymentId());
// set compute resource id to process model, default we set the same in the user preferred compute host id
- processModel.setComputeResourceId(processModel.getResourceSchedule().getResourceHostId());
+ processModel.setComputeResourceId(processModel.getProcessResourceSchedule().getResourceHostId());
experimentCatalog.update(ExperimentCatalogModelType.PROCESS, processModel,processModel.getProcessId());
return orchestrator.launchProcess(processModel, airavataCredStoreToken);
} catch (Exception e) {
@@ -353,8 +353,8 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
IllegalAccessException {
Map<String, String> moduleIdFilter = new HashMap<String, String>();
moduleIdFilter.put(AppCatAbstractResource.ApplicationDeploymentConstants.APP_MODULE_ID, selectedModuleId);
- if (processModel.getResourceSchedule() != null && processModel.getResourceSchedule().getResourceHostId() != null) {
- moduleIdFilter.put(AppCatAbstractResource.ApplicationDeploymentConstants.COMPUTE_HOST_ID, processModel.getResourceSchedule().getResourceHostId());
+ if (processModel.getProcessResourceSchedule() != null && processModel.getProcessResourceSchedule().getResourceHostId() != null) {
+ moduleIdFilter.put(AppCatAbstractResource.ApplicationDeploymentConstants.COMPUTE_HOST_ID, processModel.getProcessResourceSchedule().getResourceHostId());
}
List<ApplicationDeploymentDescription> applicationDeployements = appCatalog.getApplicationDeployment().getApplicationDeployements(moduleIdFilter);
Map<ComputeResourceDescription, ApplicationDeploymentDescription> deploymentMap = new HashMap<ComputeResourceDescription, ApplicationDeploymentDescription>();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/Main.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/Main.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/Main.java
deleted file mode 100644
index e509b47..0000000
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/Main.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.registry.core;
-
-import org.apache.airavata.model.user.NSFDemographics;
-import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
-import org.apache.airavata.model.workspace.Notification;
-import org.apache.airavata.registry.core.entities.workspacecatalog.GatewayEntity;
-import org.apache.airavata.registry.core.entities.workspacecatalog.NotificationEntity;
-import org.apache.airavata.registry.core.entities.workspacecatalog.UserProfileEntity;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.GatewayRepository;
-import org.apache.airavata.registry.core.repositories.workspacecatalog.NotificationRepository;
-import org.apache.airavata.registry.core.utils.JPAUtils;
-import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
-import org.dozer.Mapper;
-
-import java.io.IOException;
-import java.util.UUID;
-
-public class Main {
-
- public static void main(String[] args) throws IOException {
- org.apache.airavata.model.user.UserProfile userProfile = new org.apache.airavata.model.user.UserProfile();
- userProfile.setAiravataInternalUserId("I don't know");
- NSFDemographics nsfDemographics = new NSFDemographics();
- nsfDemographics.setGender("sdfsf");
- userProfile.setNsfDemographics(nsfDemographics);
-
- Mapper mapper = ObjectMapperSingleton.getInstance();
- UserProfileEntity destObject =
- mapper.map(userProfile, UserProfileEntity.class);
-
- System.out.println(destObject.getNsfDemographics().getGender());
-
- userProfile = mapper.map(destObject, org.apache.airavata.model.user.UserProfile.class);
- System.out.println(userProfile.getNsfDemographics().getGender());
-
- JPAUtils.getEntityManager();
-
- Gateway gateway = new Gateway();
- gateway.setGatewayApprovalStatus(GatewayApprovalStatus.ACTIVE);
- gateway.setGatewayId("test.com" + System.currentTimeMillis());
- gateway.setDomain("test.com");
-
- GatewayRepository gatewayRepository = new GatewayRepository(Gateway.class, GatewayEntity.class);
- gateway = gatewayRepository.create(gateway);
- System.out.println(gateway.getGatewayId());
-
- Notification notification = new Notification();
- notification.setNotificationId(UUID.randomUUID().toString());
- notification.setGatewayId(gateway.getGatewayId());
-
- NotificationRepository notificationRepository = new NotificationRepository(Notification.class, NotificationEntity.class);
- notificationRepository.create(notification);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index 796253f..a0686f8 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -47,6 +47,8 @@ public class ExperimentEntity {
private UserConfigurationEntity userConfigurationData;
+ private List<ProcessEntity> processes;
+
@Id
@Column(name = "EXPERIMENT_ID")
public String getExperimentId() {
@@ -210,4 +212,13 @@ public class ExperimentEntity {
public void setExperimentStatuses(List<ExperimentStatusEntity> experimentStatuses) {
this.experimentStatuses = experimentStatuses;
}
+
+ @OneToMany(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, mappedBy = "experiment")
+ public List<ProcessEntity> getProcesses() {
+ return processes;
+ }
+
+ public void setProcesses(List<ProcessEntity> processes) {
+ this.processes = processes;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
new file mode 100644
index 0000000..d7c6cca
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -0,0 +1,266 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "PROCESS")
+public class ProcessEntity {
+ private String processId;
+ private String experimentId;
+ private long creationTime;
+ private long lastUpdateTime;
+ private String processDetail;
+ private String applicationInterfaceId;
+ private String applicationDeploymentId;
+ private String computeResourceId;
+ private String taskDag;
+ private String gatewayExecutionId;
+ private boolean enableEmailNotification;
+ private List<String> emailAddresses;
+ private String storageResourceId;
+ private String userDn;
+ private boolean generateCert;
+ private String experimentDataDir;
+ private String userName;
+
+ private List<ProcessStatusEntity> processStatus;
+ private List<ProcessErrorEntity> processError;
+ private List<ProcessInputEntity> processInputs;
+ private List<ProcessOutputEntity> processOutputs;
+ private ProcessResourceSchedulingEntity processResourceSchedule;
+
+ private ExperimentEntity experiment;
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Column(name = "EXPERIMENT_ID")
+ public String getExperimentId() {
+ return experimentId;
+ }
+
+ public void setExperimentId(String experimentId) {
+ this.experimentId = experimentId;
+ }
+
+ @Column(name = "CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "LAST_UPDATE_TIME")
+ public long getLastUpdateTime() {
+ return lastUpdateTime;
+ }
+
+ public void setLastUpdateTime(long lastUpdateTime) {
+ this.lastUpdateTime = lastUpdateTime;
+ }
+
+ @Column(name = "PROCESS_DETAIL")
+ public String getProcessDetail() {
+ return processDetail;
+ }
+
+ public void setProcessDetail(String processDetail) {
+ this.processDetail = processDetail;
+ }
+
+ @Column(name = "APPLICATION_INTERFACE_ID")
+ public String getApplicationInterfaceId() {
+ return applicationInterfaceId;
+ }
+
+ public void setApplicationInterfaceId(String applicationInterfaceId) {
+ this.applicationInterfaceId = applicationInterfaceId;
+ }
+
+ @Column(name = "APPLICATION_DEPLOYMENT_ID")
+ public String getApplicationDeploymentId() {
+ return applicationDeploymentId;
+ }
+
+ public void setApplicationDeploymentId(String applicationDeploymentId) {
+ this.applicationDeploymentId = applicationDeploymentId;
+ }
+
+
+ @Column(name = "COMPUTE_RESOURCE_ID")
+ public String getComputeResourceId() {
+ return computeResourceId;
+ }
+
+ public void setComputeResourceId(String computeResourceId) {
+ this.computeResourceId = computeResourceId;
+ }
+
+ @Column(name = "TASK_DAG")
+ public String getTaskDag() {
+ return taskDag;
+ }
+
+ public void setTaskDag(String taskDag) {
+ this.taskDag = taskDag;
+ }
+
+ @Column(name = "GATEWAY_EXECUTION_ID")
+ public String getGatewayExecutionId() {
+ return gatewayExecutionId;
+ }
+
+ public void setGatewayExecutionId(String gatewayExecutionId) {
+ this.gatewayExecutionId = gatewayExecutionId;
+ }
+
+ @Column(name = "ENABLE_EMAIL_NOTIFICATION")
+ public boolean isEnableEmailNotification() {
+ return enableEmailNotification;
+ }
+
+ public void setEnableEmailNotification(boolean enableEmailNotification) {
+ this.enableEmailNotification = enableEmailNotification;
+ }
+
+ @ElementCollection
+ @CollectionTable(name="PROCESS_EMAIL", joinColumns = @JoinColumn(name="PROCESS_ID"))
+ public List<String> getEmailAddresses() {
+ return emailAddresses;
+ }
+
+ public void setEmailAddresses(List<String> emailAddresses) {
+ this.emailAddresses = emailAddresses;
+ }
+
+ @Column(name = "STORAGE_RESOURCE_ID")
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ @Column(name = "USER_DN")
+ public String getUserDn() {
+ return userDn;
+ }
+
+ public void setUserDn(String userDn) {
+ this.userDn = userDn;
+ }
+
+ @Column(name = "GENERATE_CERT")
+ public boolean isGenerateCert() {
+ return generateCert;
+ }
+
+ public void setGenerateCert(boolean generateCert) {
+ this.generateCert = generateCert;
+ }
+
+ @Column(name = "EXPERIMENT_DATA_DIR")
+ public String getExperimentDataDir() {
+ return experimentDataDir;
+ }
+
+ public void setExperimentDataDir(String experimentDataDir) {
+ this.experimentDataDir = experimentDataDir;
+ }
+
+ @Column(name = "USER_NAME")
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @OneToMany(targetEntity = ProcessStatusEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public List<ProcessStatusEntity> getProcessStatus() {
+ return processStatus;
+ }
+
+ public void setProcessStatus(List<ProcessStatusEntity> processStatus) {
+ this.processStatus = processStatus;
+ }
+
+ @OneToMany(targetEntity = ProcessErrorEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public List<ProcessErrorEntity> getProcessError() {
+ return processError;
+ }
+
+ public void setProcessError(List<ProcessErrorEntity> processError) {
+ this.processError = processError;
+ }
+
+ @OneToMany(targetEntity = ProcessInputEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public List<ProcessInputEntity> getProcessInputs() {
+ return processInputs;
+ }
+
+ public void setProcessInputs(List<ProcessInputEntity> processInputs) {
+ this.processInputs = processInputs;
+ }
+
+ @OneToMany(targetEntity = ProcessOutputEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public List<ProcessOutputEntity> getProcessOutputs() {
+ return processOutputs;
+ }
+
+ public void setProcessOutputs(List<ProcessOutputEntity> processOutputs) {
+ this.processOutputs = processOutputs;
+ }
+
+ @OneToOne(targetEntity = ProcessResourceSchedulingEntity.class, cascade = CascadeType.ALL, mappedBy = "process")
+ public ProcessResourceSchedulingEntity getProcessResourceSchedule() {
+ return processResourceSchedule;
+ }
+
+ public void setProcessResourceSchedule(ProcessResourceSchedulingEntity proceeResourceSchedule) {
+ this.processResourceSchedule = proceeResourceSchedule;
+ }
+
+ @ManyToOne(targetEntity = ExperimentEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
+ public ExperimentEntity getExperiment() {
+ return experiment;
+ }
+
+ public void setExperiment(ExperimentEntity experiment) {
+ this.experiment = experiment;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
----------------------------------------------------------------------
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
new file mode 100644
index 0000000..bae331f
--- /dev/null
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -0,0 +1,118 @@
+/*
+ *
+ * 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.entities.expcatalog;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "PROCESS_ERROR")
+@IdClass(ProcessErrorPK.class)
+public class ProcessErrorEntity {
+ private String errorId;
+ private String processId;
+ private long creationTime;
+ private String actualErrorMessage;
+ private String userFriendlyMessage;
+ private boolean transientOrPersistent;
+ private List<String> rootCauseErrorIdList;
+
+ private ProcessEntity process;
+
+ @Id
+ @Column(name = "ERROR_ID")
+ public String getErrorId() {
+ return errorId;
+ }
+
+ public void setErrorId(String errorId) {
+ this.errorId = errorId;
+ }
+
+ @Id
+ @Column(name = "PROCESS_ID")
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ @Column(name = "CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "ACTUAL_ERROR_MESSAGE")
+ public String getActualErrorMessage() {
+ return actualErrorMessage;
+ }
+
+ public void setActualErrorMessage(String actualErrorMessage) {
+ this.actualErrorMessage = actualErrorMessage;
+ }
+
+ @Column(name = "USER_FRIENDLY_MESSAGE")
+ public String getUserFriendlyMessage() {
+ return userFriendlyMessage;
+ }
+
+ public void setUserFriendlyMessage(String userFriendlyMessage) {
+ this.userFriendlyMessage = userFriendlyMessage;
+ }
+
+
+ @Column(name = "TRANSIENT_OR_PERSISTENT")
+ public boolean isTransientOrPersistent() {
+ return transientOrPersistent;
+ }
+
+ public void setTransientOrPersistent(boolean transientOrPersistent) {
+ this.transientOrPersistent = transientOrPersistent;
+ }
+
+
+ @ElementCollection
+ @CollectionTable(name="EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
+ public List<String> getRootCauseErrorIdList() {
+ return rootCauseErrorIdList;
+ }
+
+ public void setRootCauseErrorIdList(List<String> rootCauseErrorIdList) {
+ this.rootCauseErrorIdList = rootCauseErrorIdList;
+ }
+
+
+ @ManyToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ @JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
+ public ProcessEntity getProcess() {
+ return process;
+ }
+
+ public void setProcess(ProcessEntity process) {
+ this.process = process;
+ }
+}
\ No newline at end of file
[05/10] airavata git commit: adding process model classes
Posted by sc...@apache.org.
adding process model classes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/171c0425
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/171c0425
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/171c0425
Branch: refs/heads/develop
Commit: 171c0425f81dd9b6d113c51cd2daa9ccf7ca8cf0
Parents: 3ce49b9
Author: scnakandala <su...@gmail.com>
Authored: Mon Aug 29 13:41:11 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon Aug 29 13:41:11 2016 -0400
----------------------------------------------------------------------
.../lib/airavata/process_model_types.cpp | 260 ++++++-----
.../lib/airavata/process_model_types.h | 20 +-
.../lib/Airavata/Model/Process/Types.php | 180 +++++---
.../lib/apache/airavata/model/process/ttypes.py | 114 ++---
.../airavata/model/process/ProcessModel.java | 426 ++++++++++++-------
.../apache/airavata/model/user/UserProfile.java | 24 +-
.../model/util/ExperimentModelUtil.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../gfac/core/context/ProcessContext.java | 21 +-
.../org/apache/airavata/gfac/impl/Factory.java | 4 +-
.../gfac/impl/task/DataStreamingTask.java | 2 +-
.../task/utils/bes/ApplicationProcessor.java | 2 +-
.../impl/task/utils/bes/ResourceProcessor.java | 2 +-
.../core/utils/OrchestratorUtils.java | 4 +-
.../validator/impl/BatchQueueValidator.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 2 +-
.../server/OrchestratorServerHandler.java | 6 +-
.../org/apache/airavata/registry/core/Main.java | 75 ----
.../entities/expcatalog/ExperimentEntity.java | 11 +
.../core/entities/expcatalog/ProcessEntity.java | 266 ++++++++++++
.../entities/expcatalog/ProcessErrorEntity.java | 118 +++++
.../entities/expcatalog/ProcessErrorPK.java | 75 ++++
.../entities/expcatalog/ProcessInputEntity.java | 174 ++++++++
.../entities/expcatalog/ProcessInputPK.java | 74 ++++
.../expcatalog/ProcessOutputEntity.java | 165 +++++++
.../entities/expcatalog/ProcessOutputPK.java | 70 +++
.../ProcessResourceSchedulingEntity.java | 170 ++++++++
.../expcatalog/ProcessStatusEntity.java | 83 ++++
.../entities/expcatalog/ProcessStatusPK.java | 74 ++++
.../expcatalog/ExperimentRepository.java | 22 +-
.../src/main/resources/META-INF/persistence.xml | 6 +
.../src/main/resources/experiment_catalog.sql | 108 +++++
.../catalog/impl/ExperimentRegistry.java | 60 +--
.../utils/ThriftDataModelConversion.java | 10 +-
.../process_model.thrift | 6 +-
35 files changed, 2106 insertions(+), 534 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
index cdd437a..8135174 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.cpp
@@ -53,7 +53,7 @@ void ProcessModel::__set_lastUpdateTime(const int64_t val) {
__isset.lastUpdateTime = true;
}
-void ProcessModel::__set_processStatus(const ::apache::airavata::model::status::ProcessStatus& val) {
+void ProcessModel::__set_processStatus(const std::vector< ::apache::airavata::model::status::ProcessStatus> & val) {
this->processStatus = val;
__isset.processStatus = true;
}
@@ -88,9 +88,9 @@ void ProcessModel::__set_processOutputs(const std::vector< ::apache::airavata::m
__isset.processOutputs = true;
}
-void ProcessModel::__set_resourceSchedule(const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& val) {
- this->resourceSchedule = val;
-__isset.resourceSchedule = true;
+void ProcessModel::__set_processResourceSchedule(const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& val) {
+ this->processResourceSchedule = val;
+__isset.processResourceSchedule = true;
}
void ProcessModel::__set_tasks(const std::vector< ::apache::airavata::model::task::TaskModel> & val) {
@@ -103,7 +103,7 @@ void ProcessModel::__set_taskDag(const std::string& val) {
__isset.taskDag = true;
}
-void ProcessModel::__set_processError(const ::apache::airavata::model::commons::ErrorModel& val) {
+void ProcessModel::__set_processError(const std::vector< ::apache::airavata::model::commons::ErrorModel> & val) {
this->processError = val;
__isset.processError = true;
}
@@ -204,8 +204,20 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 5:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->processStatus.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->processStatus.clear();
+ uint32_t _size0;
+ ::apache::thrift::protocol::TType _etype3;
+ xfer += iprot->readListBegin(_etype3, _size0);
+ this->processStatus.resize(_size0);
+ uint32_t _i4;
+ for (_i4 = 0; _i4 < _size0; ++_i4)
+ {
+ xfer += this->processStatus[_i4].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.processStatus = true;
} else {
xfer += iprot->skip(ftype);
@@ -247,14 +259,14 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->processInputs.clear();
- uint32_t _size0;
- ::apache::thrift::protocol::TType _etype3;
- xfer += iprot->readListBegin(_etype3, _size0);
- this->processInputs.resize(_size0);
- uint32_t _i4;
- for (_i4 = 0; _i4 < _size0; ++_i4)
+ uint32_t _size5;
+ ::apache::thrift::protocol::TType _etype8;
+ xfer += iprot->readListBegin(_etype8, _size5);
+ this->processInputs.resize(_size5);
+ uint32_t _i9;
+ for (_i9 = 0; _i9 < _size5; ++_i9)
{
- xfer += this->processInputs[_i4].read(iprot);
+ xfer += this->processInputs[_i9].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -267,14 +279,14 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->processOutputs.clear();
- uint32_t _size5;
- ::apache::thrift::protocol::TType _etype8;
- xfer += iprot->readListBegin(_etype8, _size5);
- this->processOutputs.resize(_size5);
- uint32_t _i9;
- for (_i9 = 0; _i9 < _size5; ++_i9)
+ uint32_t _size10;
+ ::apache::thrift::protocol::TType _etype13;
+ xfer += iprot->readListBegin(_etype13, _size10);
+ this->processOutputs.resize(_size10);
+ uint32_t _i14;
+ for (_i14 = 0; _i14 < _size10; ++_i14)
{
- xfer += this->processOutputs[_i9].read(iprot);
+ xfer += this->processOutputs[_i14].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -285,8 +297,8 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 12:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->resourceSchedule.read(iprot);
- this->__isset.resourceSchedule = true;
+ xfer += this->processResourceSchedule.read(iprot);
+ this->__isset.processResourceSchedule = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -295,14 +307,14 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->tasks.clear();
- uint32_t _size10;
- ::apache::thrift::protocol::TType _etype13;
- xfer += iprot->readListBegin(_etype13, _size10);
- this->tasks.resize(_size10);
- uint32_t _i14;
- for (_i14 = 0; _i14 < _size10; ++_i14)
+ uint32_t _size15;
+ ::apache::thrift::protocol::TType _etype18;
+ xfer += iprot->readListBegin(_etype18, _size15);
+ this->tasks.resize(_size15);
+ uint32_t _i19;
+ for (_i19 = 0; _i19 < _size15; ++_i19)
{
- xfer += this->tasks[_i14].read(iprot);
+ xfer += this->tasks[_i19].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -320,8 +332,20 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 15:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->processError.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->processError.clear();
+ uint32_t _size20;
+ ::apache::thrift::protocol::TType _etype23;
+ xfer += iprot->readListBegin(_etype23, _size20);
+ this->processError.resize(_size20);
+ uint32_t _i24;
+ for (_i24 = 0; _i24 < _size20; ++_i24)
+ {
+ xfer += this->processError[_i24].read(iprot);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.processError = true;
} else {
xfer += iprot->skip(ftype);
@@ -347,14 +371,14 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->emailAddresses.clear();
- uint32_t _size15;
- ::apache::thrift::protocol::TType _etype18;
- xfer += iprot->readListBegin(_etype18, _size15);
- this->emailAddresses.resize(_size15);
- uint32_t _i19;
- for (_i19 = 0; _i19 < _size15; ++_i19)
+ uint32_t _size25;
+ ::apache::thrift::protocol::TType _etype28;
+ xfer += iprot->readListBegin(_etype28, _size25);
+ this->emailAddresses.resize(_size25);
+ uint32_t _i29;
+ for (_i29 = 0; _i29 < _size25; ++_i29)
{
- xfer += iprot->readString(this->emailAddresses[_i19]);
+ xfer += iprot->readString(this->emailAddresses[_i29]);
}
xfer += iprot->readListEnd();
}
@@ -443,8 +467,16 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.processStatus) {
- xfer += oprot->writeFieldBegin("processStatus", ::apache::thrift::protocol::T_STRUCT, 5);
- xfer += this->processStatus.write(oprot);
+ xfer += oprot->writeFieldBegin("processStatus", ::apache::thrift::protocol::T_LIST, 5);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processStatus.size()));
+ std::vector< ::apache::airavata::model::status::ProcessStatus> ::const_iterator _iter30;
+ for (_iter30 = this->processStatus.begin(); _iter30 != this->processStatus.end(); ++_iter30)
+ {
+ xfer += (*_iter30).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
if (this->__isset.processDetail) {
@@ -471,10 +503,10 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldBegin("processInputs", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processInputs.size()));
- std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter20;
- for (_iter20 = this->processInputs.begin(); _iter20 != this->processInputs.end(); ++_iter20)
+ std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter31;
+ for (_iter31 = this->processInputs.begin(); _iter31 != this->processInputs.end(); ++_iter31)
{
- xfer += (*_iter20).write(oprot);
+ xfer += (*_iter31).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -484,28 +516,28 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldBegin("processOutputs", ::apache::thrift::protocol::T_LIST, 11);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processOutputs.size()));
- std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter21;
- for (_iter21 = this->processOutputs.begin(); _iter21 != this->processOutputs.end(); ++_iter21)
+ std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter32;
+ for (_iter32 = this->processOutputs.begin(); _iter32 != this->processOutputs.end(); ++_iter32)
{
- xfer += (*_iter21).write(oprot);
+ xfer += (*_iter32).write(oprot);
}
xfer += oprot->writeListEnd();
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.resourceSchedule) {
- xfer += oprot->writeFieldBegin("resourceSchedule", ::apache::thrift::protocol::T_STRUCT, 12);
- xfer += this->resourceSchedule.write(oprot);
+ if (this->__isset.processResourceSchedule) {
+ xfer += oprot->writeFieldBegin("processResourceSchedule", ::apache::thrift::protocol::T_STRUCT, 12);
+ xfer += this->processResourceSchedule.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.tasks) {
xfer += oprot->writeFieldBegin("tasks", ::apache::thrift::protocol::T_LIST, 13);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->tasks.size()));
- std::vector< ::apache::airavata::model::task::TaskModel> ::const_iterator _iter22;
- for (_iter22 = this->tasks.begin(); _iter22 != this->tasks.end(); ++_iter22)
+ std::vector< ::apache::airavata::model::task::TaskModel> ::const_iterator _iter33;
+ for (_iter33 = this->tasks.begin(); _iter33 != this->tasks.end(); ++_iter33)
{
- xfer += (*_iter22).write(oprot);
+ xfer += (*_iter33).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -517,8 +549,16 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.processError) {
- xfer += oprot->writeFieldBegin("processError", ::apache::thrift::protocol::T_STRUCT, 15);
- xfer += this->processError.write(oprot);
+ xfer += oprot->writeFieldBegin("processError", ::apache::thrift::protocol::T_LIST, 15);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processError.size()));
+ std::vector< ::apache::airavata::model::commons::ErrorModel> ::const_iterator _iter34;
+ for (_iter34 = this->processError.begin(); _iter34 != this->processError.end(); ++_iter34)
+ {
+ xfer += (*_iter34).write(oprot);
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayExecutionId) {
@@ -535,10 +575,10 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldBegin("emailAddresses", ::apache::thrift::protocol::T_LIST, 18);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->emailAddresses.size()));
- std::vector<std::string> ::const_iterator _iter23;
- for (_iter23 = this->emailAddresses.begin(); _iter23 != this->emailAddresses.end(); ++_iter23)
+ std::vector<std::string> ::const_iterator _iter35;
+ for (_iter35 = this->emailAddresses.begin(); _iter35 != this->emailAddresses.end(); ++_iter35)
{
- xfer += oprot->writeString((*_iter23));
+ xfer += oprot->writeString((*_iter35));
}
xfer += oprot->writeListEnd();
}
@@ -587,7 +627,7 @@ void swap(ProcessModel &a, ProcessModel &b) {
swap(a.computeResourceId, b.computeResourceId);
swap(a.processInputs, b.processInputs);
swap(a.processOutputs, b.processOutputs);
- swap(a.resourceSchedule, b.resourceSchedule);
+ swap(a.processResourceSchedule, b.processResourceSchedule);
swap(a.tasks, b.tasks);
swap(a.taskDag, b.taskDag);
swap(a.processError, b.processError);
@@ -602,57 +642,57 @@ void swap(ProcessModel &a, ProcessModel &b) {
swap(a.__isset, b.__isset);
}
-ProcessModel::ProcessModel(const ProcessModel& other24) {
- processId = other24.processId;
- experimentId = other24.experimentId;
- creationTime = other24.creationTime;
- lastUpdateTime = other24.lastUpdateTime;
- processStatus = other24.processStatus;
- processDetail = other24.processDetail;
- applicationInterfaceId = other24.applicationInterfaceId;
- applicationDeploymentId = other24.applicationDeploymentId;
- computeResourceId = other24.computeResourceId;
- processInputs = other24.processInputs;
- processOutputs = other24.processOutputs;
- resourceSchedule = other24.resourceSchedule;
- tasks = other24.tasks;
- taskDag = other24.taskDag;
- processError = other24.processError;
- gatewayExecutionId = other24.gatewayExecutionId;
- enableEmailNotification = other24.enableEmailNotification;
- emailAddresses = other24.emailAddresses;
- storageResourceId = other24.storageResourceId;
- userDn = other24.userDn;
- generateCert = other24.generateCert;
- experimentDataDir = other24.experimentDataDir;
- userName = other24.userName;
- __isset = other24.__isset;
+ProcessModel::ProcessModel(const ProcessModel& other36) {
+ processId = other36.processId;
+ experimentId = other36.experimentId;
+ creationTime = other36.creationTime;
+ lastUpdateTime = other36.lastUpdateTime;
+ processStatus = other36.processStatus;
+ processDetail = other36.processDetail;
+ applicationInterfaceId = other36.applicationInterfaceId;
+ applicationDeploymentId = other36.applicationDeploymentId;
+ computeResourceId = other36.computeResourceId;
+ processInputs = other36.processInputs;
+ processOutputs = other36.processOutputs;
+ processResourceSchedule = other36.processResourceSchedule;
+ tasks = other36.tasks;
+ taskDag = other36.taskDag;
+ processError = other36.processError;
+ gatewayExecutionId = other36.gatewayExecutionId;
+ enableEmailNotification = other36.enableEmailNotification;
+ emailAddresses = other36.emailAddresses;
+ storageResourceId = other36.storageResourceId;
+ userDn = other36.userDn;
+ generateCert = other36.generateCert;
+ experimentDataDir = other36.experimentDataDir;
+ userName = other36.userName;
+ __isset = other36.__isset;
}
-ProcessModel& ProcessModel::operator=(const ProcessModel& other25) {
- processId = other25.processId;
- experimentId = other25.experimentId;
- creationTime = other25.creationTime;
- lastUpdateTime = other25.lastUpdateTime;
- processStatus = other25.processStatus;
- processDetail = other25.processDetail;
- applicationInterfaceId = other25.applicationInterfaceId;
- applicationDeploymentId = other25.applicationDeploymentId;
- computeResourceId = other25.computeResourceId;
- processInputs = other25.processInputs;
- processOutputs = other25.processOutputs;
- resourceSchedule = other25.resourceSchedule;
- tasks = other25.tasks;
- taskDag = other25.taskDag;
- processError = other25.processError;
- gatewayExecutionId = other25.gatewayExecutionId;
- enableEmailNotification = other25.enableEmailNotification;
- emailAddresses = other25.emailAddresses;
- storageResourceId = other25.storageResourceId;
- userDn = other25.userDn;
- generateCert = other25.generateCert;
- experimentDataDir = other25.experimentDataDir;
- userName = other25.userName;
- __isset = other25.__isset;
+ProcessModel& ProcessModel::operator=(const ProcessModel& other37) {
+ processId = other37.processId;
+ experimentId = other37.experimentId;
+ creationTime = other37.creationTime;
+ lastUpdateTime = other37.lastUpdateTime;
+ processStatus = other37.processStatus;
+ processDetail = other37.processDetail;
+ applicationInterfaceId = other37.applicationInterfaceId;
+ applicationDeploymentId = other37.applicationDeploymentId;
+ computeResourceId = other37.computeResourceId;
+ processInputs = other37.processInputs;
+ processOutputs = other37.processOutputs;
+ processResourceSchedule = other37.processResourceSchedule;
+ tasks = other37.tasks;
+ taskDag = other37.taskDag;
+ processError = other37.processError;
+ gatewayExecutionId = other37.gatewayExecutionId;
+ enableEmailNotification = other37.enableEmailNotification;
+ emailAddresses = other37.emailAddresses;
+ storageResourceId = other37.storageResourceId;
+ userDn = other37.userDn;
+ generateCert = other37.generateCert;
+ experimentDataDir = other37.experimentDataDir;
+ userName = other37.userName;
+ __isset = other37.__isset;
return *this;
}
void ProcessModel::printTo(std::ostream& out) const {
@@ -669,7 +709,7 @@ void ProcessModel::printTo(std::ostream& out) const {
out << ", " << "computeResourceId="; (__isset.computeResourceId ? (out << to_string(computeResourceId)) : (out << "<null>"));
out << ", " << "processInputs="; (__isset.processInputs ? (out << to_string(processInputs)) : (out << "<null>"));
out << ", " << "processOutputs="; (__isset.processOutputs ? (out << to_string(processOutputs)) : (out << "<null>"));
- out << ", " << "resourceSchedule="; (__isset.resourceSchedule ? (out << to_string(resourceSchedule)) : (out << "<null>"));
+ out << ", " << "processResourceSchedule="; (__isset.processResourceSchedule ? (out << to_string(processResourceSchedule)) : (out << "<null>"));
out << ", " << "tasks="; (__isset.tasks ? (out << to_string(tasks)) : (out << "<null>"));
out << ", " << "taskDag="; (__isset.taskDag ? (out << to_string(taskDag)) : (out << "<null>"));
out << ", " << "processError="; (__isset.processError ? (out << to_string(processError)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
index bf5b5d0..5d73b26 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/process_model_types.h
@@ -44,7 +44,7 @@ namespace apache { namespace airavata { namespace model { namespace process {
class ProcessModel;
typedef struct _ProcessModel__isset {
- _ProcessModel__isset() : creationTime(false), lastUpdateTime(false), processStatus(false), processDetail(false), applicationInterfaceId(false), applicationDeploymentId(false), computeResourceId(false), processInputs(false), processOutputs(false), resourceSchedule(false), tasks(false), taskDag(false), processError(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), storageResourceId(false), userDn(false), generateCert(true), experimentDataDir(false), userName(false) {}
+ _ProcessModel__isset() : creationTime(false), lastUpdateTime(false), processStatus(false), processDetail(false), applicationInterfaceId(false), applicationDeploymentId(false), computeResourceId(false), processInputs(false), processOutputs(false), processResourceSchedule(false), tasks(false), taskDag(false), processError(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), storageResourceId(false), userDn(false), generateCert(true), experimentDataDir(false), userName(false) {}
bool creationTime :1;
bool lastUpdateTime :1;
bool processStatus :1;
@@ -54,7 +54,7 @@ typedef struct _ProcessModel__isset {
bool computeResourceId :1;
bool processInputs :1;
bool processOutputs :1;
- bool resourceSchedule :1;
+ bool processResourceSchedule :1;
bool tasks :1;
bool taskDag :1;
bool processError :1;
@@ -81,17 +81,17 @@ class ProcessModel {
std::string experimentId;
int64_t creationTime;
int64_t lastUpdateTime;
- ::apache::airavata::model::status::ProcessStatus processStatus;
+ std::vector< ::apache::airavata::model::status::ProcessStatus> processStatus;
std::string processDetail;
std::string applicationInterfaceId;
std::string applicationDeploymentId;
std::string computeResourceId;
std::vector< ::apache::airavata::model::application::io::InputDataObjectType> processInputs;
std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> processOutputs;
- ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel resourceSchedule;
+ ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel processResourceSchedule;
std::vector< ::apache::airavata::model::task::TaskModel> tasks;
std::string taskDag;
- ::apache::airavata::model::commons::ErrorModel processError;
+ std::vector< ::apache::airavata::model::commons::ErrorModel> processError;
std::string gatewayExecutionId;
bool enableEmailNotification;
std::vector<std::string> emailAddresses;
@@ -111,7 +111,7 @@ class ProcessModel {
void __set_lastUpdateTime(const int64_t val);
- void __set_processStatus(const ::apache::airavata::model::status::ProcessStatus& val);
+ void __set_processStatus(const std::vector< ::apache::airavata::model::status::ProcessStatus> & val);
void __set_processDetail(const std::string& val);
@@ -125,13 +125,13 @@ class ProcessModel {
void __set_processOutputs(const std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & val);
- void __set_resourceSchedule(const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& val);
+ void __set_processResourceSchedule(const ::apache::airavata::model::scheduling::ComputationalResourceSchedulingModel& val);
void __set_tasks(const std::vector< ::apache::airavata::model::task::TaskModel> & val);
void __set_taskDag(const std::string& val);
- void __set_processError(const ::apache::airavata::model::commons::ErrorModel& val);
+ void __set_processError(const std::vector< ::apache::airavata::model::commons::ErrorModel> & val);
void __set_gatewayExecutionId(const std::string& val);
@@ -191,9 +191,9 @@ class ProcessModel {
return false;
else if (__isset.processOutputs && !(processOutputs == rhs.processOutputs))
return false;
- if (__isset.resourceSchedule != rhs.__isset.resourceSchedule)
+ if (__isset.processResourceSchedule != rhs.__isset.processResourceSchedule)
return false;
- else if (__isset.resourceSchedule && !(resourceSchedule == rhs.resourceSchedule))
+ else if (__isset.processResourceSchedule && !(processResourceSchedule == rhs.processResourceSchedule))
return false;
if (__isset.tasks != rhs.__isset.tasks)
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Process/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Process/Types.php
index 179be2b..e1b7b81 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Process/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Process/Types.php
@@ -46,7 +46,7 @@ class ProcessModel {
*/
public $lastUpdateTime = null;
/**
- * @var \Airavata\Model\Status\ProcessStatus
+ * @var \Airavata\Model\Status\ProcessStatus[]
*/
public $processStatus = null;
/**
@@ -76,7 +76,7 @@ class ProcessModel {
/**
* @var \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel
*/
- public $resourceSchedule = null;
+ public $processResourceSchedule = null;
/**
* @var \Airavata\Model\Task\TaskModel[]
*/
@@ -86,7 +86,7 @@ class ProcessModel {
*/
public $taskDag = null;
/**
- * @var \Airavata\Model\Commons\ErrorModel
+ * @var \Airavata\Model\Commons\ErrorModel[]
*/
public $processError = null;
/**
@@ -143,8 +143,12 @@ class ProcessModel {
),
5 => array(
'var' => 'processStatus',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Status\ProcessStatus',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Status\ProcessStatus',
+ ),
),
6 => array(
'var' => 'processDetail',
@@ -181,7 +185,7 @@ class ProcessModel {
),
),
12 => array(
- 'var' => 'resourceSchedule',
+ 'var' => 'processResourceSchedule',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Scheduling\ComputationalResourceSchedulingModel',
),
@@ -200,8 +204,12 @@ class ProcessModel {
),
15 => array(
'var' => 'processError',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Commons\ErrorModel',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Commons\ErrorModel',
+ ),
),
16 => array(
'var' => 'gatewayExecutionId',
@@ -275,8 +283,8 @@ class ProcessModel {
if (isset($vals['processOutputs'])) {
$this->processOutputs = $vals['processOutputs'];
}
- if (isset($vals['resourceSchedule'])) {
- $this->resourceSchedule = $vals['resourceSchedule'];
+ if (isset($vals['processResourceSchedule'])) {
+ $this->processResourceSchedule = $vals['processResourceSchedule'];
}
if (isset($vals['tasks'])) {
$this->tasks = $vals['tasks'];
@@ -362,9 +370,19 @@ class ProcessModel {
}
break;
case 5:
- if ($ftype == TType::STRUCT) {
- $this->processStatus = new \Airavata\Model\Status\ProcessStatus();
- $xfer += $this->processStatus->read($input);
+ if ($ftype == TType::LST) {
+ $this->processStatus = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Status\ProcessStatus();
+ $xfer += $elem5->read($input);
+ $this->processStatus []= $elem5;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -400,15 +418,15 @@ class ProcessModel {
case 10:
if ($ftype == TType::LST) {
$this->processInputs = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size6 = 0;
+ $_etype9 = 0;
+ $xfer += $input->readListBegin($_etype9, $_size6);
+ for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
{
- $elem5 = null;
- $elem5 = new \Airavata\Model\Application\Io\InputDataObjectType();
- $xfer += $elem5->read($input);
- $this->processInputs []= $elem5;
+ $elem11 = null;
+ $elem11 = new \Airavata\Model\Application\Io\InputDataObjectType();
+ $xfer += $elem11->read($input);
+ $this->processInputs []= $elem11;
}
$xfer += $input->readListEnd();
} else {
@@ -418,15 +436,15 @@ class ProcessModel {
case 11:
if ($ftype == TType::LST) {
$this->processOutputs = array();
- $_size6 = 0;
- $_etype9 = 0;
- $xfer += $input->readListBegin($_etype9, $_size6);
- for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+ $_size12 = 0;
+ $_etype15 = 0;
+ $xfer += $input->readListBegin($_etype15, $_size12);
+ for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
{
- $elem11 = null;
- $elem11 = new \Airavata\Model\Application\Io\OutputDataObjectType();
- $xfer += $elem11->read($input);
- $this->processOutputs []= $elem11;
+ $elem17 = null;
+ $elem17 = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $elem17->read($input);
+ $this->processOutputs []= $elem17;
}
$xfer += $input->readListEnd();
} else {
@@ -435,8 +453,8 @@ class ProcessModel {
break;
case 12:
if ($ftype == TType::STRUCT) {
- $this->resourceSchedule = new \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel();
- $xfer += $this->resourceSchedule->read($input);
+ $this->processResourceSchedule = new \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel();
+ $xfer += $this->processResourceSchedule->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -444,15 +462,15 @@ class ProcessModel {
case 13:
if ($ftype == TType::LST) {
$this->tasks = array();
- $_size12 = 0;
- $_etype15 = 0;
- $xfer += $input->readListBegin($_etype15, $_size12);
- for ($_i16 = 0; $_i16 < $_size12; ++$_i16)
+ $_size18 = 0;
+ $_etype21 = 0;
+ $xfer += $input->readListBegin($_etype21, $_size18);
+ for ($_i22 = 0; $_i22 < $_size18; ++$_i22)
{
- $elem17 = null;
- $elem17 = new \Airavata\Model\Task\TaskModel();
- $xfer += $elem17->read($input);
- $this->tasks []= $elem17;
+ $elem23 = null;
+ $elem23 = new \Airavata\Model\Task\TaskModel();
+ $xfer += $elem23->read($input);
+ $this->tasks []= $elem23;
}
$xfer += $input->readListEnd();
} else {
@@ -467,9 +485,19 @@ class ProcessModel {
}
break;
case 15:
- if ($ftype == TType::STRUCT) {
- $this->processError = new \Airavata\Model\Commons\ErrorModel();
- $xfer += $this->processError->read($input);
+ if ($ftype == TType::LST) {
+ $this->processError = array();
+ $_size24 = 0;
+ $_etype27 = 0;
+ $xfer += $input->readListBegin($_etype27, $_size24);
+ for ($_i28 = 0; $_i28 < $_size24; ++$_i28)
+ {
+ $elem29 = null;
+ $elem29 = new \Airavata\Model\Commons\ErrorModel();
+ $xfer += $elem29->read($input);
+ $this->processError []= $elem29;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -491,14 +519,14 @@ class ProcessModel {
case 18:
if ($ftype == TType::LST) {
$this->emailAddresses = array();
- $_size18 = 0;
- $_etype21 = 0;
- $xfer += $input->readListBegin($_etype21, $_size18);
- for ($_i22 = 0; $_i22 < $_size18; ++$_i22)
+ $_size30 = 0;
+ $_etype33 = 0;
+ $xfer += $input->readListBegin($_etype33, $_size30);
+ for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
{
- $elem23 = null;
- $xfer += $input->readString($elem23);
- $this->emailAddresses []= $elem23;
+ $elem35 = null;
+ $xfer += $input->readString($elem35);
+ $this->emailAddresses []= $elem35;
}
$xfer += $input->readListEnd();
} else {
@@ -574,11 +602,20 @@ class ProcessModel {
$xfer += $output->writeFieldEnd();
}
if ($this->processStatus !== null) {
- if (!is_object($this->processStatus)) {
+ if (!is_array($this->processStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('processStatus', TType::STRUCT, 5);
- $xfer += $this->processStatus->write($output);
+ $xfer += $output->writeFieldBegin('processStatus', TType::LST, 5);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->processStatus));
+ {
+ foreach ($this->processStatus as $iter36)
+ {
+ $xfer += $iter36->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->processDetail !== null) {
@@ -609,9 +646,9 @@ class ProcessModel {
{
$output->writeListBegin(TType::STRUCT, count($this->processInputs));
{
- foreach ($this->processInputs as $iter24)
+ foreach ($this->processInputs as $iter37)
{
- $xfer += $iter24->write($output);
+ $xfer += $iter37->write($output);
}
}
$output->writeListEnd();
@@ -626,21 +663,21 @@ class ProcessModel {
{
$output->writeListBegin(TType::STRUCT, count($this->processOutputs));
{
- foreach ($this->processOutputs as $iter25)
+ foreach ($this->processOutputs as $iter38)
{
- $xfer += $iter25->write($output);
+ $xfer += $iter38->write($output);
}
}
$output->writeListEnd();
}
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceSchedule !== null) {
- if (!is_object($this->resourceSchedule)) {
+ if ($this->processResourceSchedule !== null) {
+ if (!is_object($this->processResourceSchedule)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('resourceSchedule', TType::STRUCT, 12);
- $xfer += $this->resourceSchedule->write($output);
+ $xfer += $output->writeFieldBegin('processResourceSchedule', TType::STRUCT, 12);
+ $xfer += $this->processResourceSchedule->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->tasks !== null) {
@@ -651,9 +688,9 @@ class ProcessModel {
{
$output->writeListBegin(TType::STRUCT, count($this->tasks));
{
- foreach ($this->tasks as $iter26)
+ foreach ($this->tasks as $iter39)
{
- $xfer += $iter26->write($output);
+ $xfer += $iter39->write($output);
}
}
$output->writeListEnd();
@@ -666,11 +703,20 @@ class ProcessModel {
$xfer += $output->writeFieldEnd();
}
if ($this->processError !== null) {
- if (!is_object($this->processError)) {
+ if (!is_array($this->processError)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('processError', TType::STRUCT, 15);
- $xfer += $this->processError->write($output);
+ $xfer += $output->writeFieldBegin('processError', TType::LST, 15);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->processError));
+ {
+ foreach ($this->processError as $iter40)
+ {
+ $xfer += $iter40->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->gatewayExecutionId !== null) {
@@ -691,9 +737,9 @@ class ProcessModel {
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
- foreach ($this->emailAddresses as $iter27)
+ foreach ($this->emailAddresses as $iter41)
{
- $xfer += $output->writeString($iter27);
+ $xfer += $output->writeString($iter41);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/171c0425/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
index 7da3b53..868b383 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/process/ttypes.py
@@ -45,7 +45,7 @@ class ProcessModel:
- computeResourceId
- processInputs
- processOutputs
- - resourceSchedule
+ - processResourceSchedule
- tasks
- taskDag
- processError
@@ -65,17 +65,17 @@ class ProcessModel:
(2, TType.STRING, 'experimentId', None, None, ), # 2
(3, TType.I64, 'creationTime', None, None, ), # 3
(4, TType.I64, 'lastUpdateTime', None, None, ), # 4
- (5, TType.STRUCT, 'processStatus', (apache.airavata.model.status.ttypes.ProcessStatus, apache.airavata.model.status.ttypes.ProcessStatus.thrift_spec), None, ), # 5
+ (5, TType.LIST, 'processStatus', (TType.STRUCT,(apache.airavata.model.status.ttypes.ProcessStatus, apache.airavata.model.status.ttypes.ProcessStatus.thrift_spec)), None, ), # 5
(6, TType.STRING, 'processDetail', None, None, ), # 6
(7, TType.STRING, 'applicationInterfaceId', None, None, ), # 7
(8, TType.STRING, 'applicationDeploymentId', None, None, ), # 8
(9, TType.STRING, 'computeResourceId', None, None, ), # 9
(10, TType.LIST, 'processInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 10
(11, TType.LIST, 'processOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 11
- (12, TType.STRUCT, 'resourceSchedule', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ), # 12
+ (12, TType.STRUCT, 'processResourceSchedule', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ), # 12
(13, TType.LIST, 'tasks', (TType.STRUCT,(apache.airavata.model.task.ttypes.TaskModel, apache.airavata.model.task.ttypes.TaskModel.thrift_spec)), None, ), # 13
(14, TType.STRING, 'taskDag', None, None, ), # 14
- (15, TType.STRUCT, 'processError', (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), None, ), # 15
+ (15, TType.LIST, 'processError', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 15
(16, TType.STRING, 'gatewayExecutionId', None, None, ), # 16
(17, TType.BOOL, 'enableEmailNotification', None, None, ), # 17
(18, TType.LIST, 'emailAddresses', (TType.STRING,None), None, ), # 18
@@ -86,7 +86,7 @@ class ProcessModel:
(23, TType.STRING, 'userName', None, None, ), # 23
)
- def __init__(self, processId=thrift_spec[1][4], experimentId=None, creationTime=None, lastUpdateTime=None, processStatus=None, processDetail=None, applicationInterfaceId=None, applicationDeploymentId=None, computeResourceId=None, processInputs=None, processOutputs=None, resourceSchedule=None, tasks=None, taskDag=None, processError=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, storageResourceId=None, userDn=None, generateCert=thrift_spec[21][4], experimentDataDir=None, userName=None,):
+ def __init__(self, processId=thrift_spec[1][4], experimentId=None, creationTime=None, lastUpdateTime=None, processStatus=None, processDetail=None, applicationInterfaceId=None, applicationDeploymentId=None, computeResourceId=None, processInputs=None, processOutputs=None, processResourceSchedule=None, tasks=None, taskDag=None, processError=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, storageResourceId=None, userDn=None, generateCert=thrift_spec[21][4], experimentDataDir=None, userName=None,):
self.processId = processId
self.experimentId = experimentId
self.creationTime = creationTime
@@ -98,7 +98,7 @@ class ProcessModel:
self.computeResourceId = computeResourceId
self.processInputs = processInputs
self.processOutputs = processOutputs
- self.resourceSchedule = resourceSchedule
+ self.processResourceSchedule = processResourceSchedule
self.tasks = tasks
self.taskDag = taskDag
self.processError = processError
@@ -141,9 +141,14 @@ class ProcessModel:
else:
iprot.skip(ftype)
elif fid == 5:
- if ftype == TType.STRUCT:
- self.processStatus = apache.airavata.model.status.ttypes.ProcessStatus()
- self.processStatus.read(iprot)
+ if ftype == TType.LIST:
+ self.processStatus = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in xrange(_size0):
+ _elem5 = apache.airavata.model.status.ttypes.ProcessStatus()
+ _elem5.read(iprot)
+ self.processStatus.append(_elem5)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 6:
@@ -169,39 +174,39 @@ class ProcessModel:
elif fid == 10:
if ftype == TType.LIST:
self.processInputs = []
- (_etype3, _size0) = iprot.readListBegin()
- for _i4 in xrange(_size0):
- _elem5 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
- _elem5.read(iprot)
- self.processInputs.append(_elem5)
+ (_etype9, _size6) = iprot.readListBegin()
+ for _i10 in xrange(_size6):
+ _elem11 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem11.read(iprot)
+ self.processInputs.append(_elem11)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 11:
if ftype == TType.LIST:
self.processOutputs = []
- (_etype9, _size6) = iprot.readListBegin()
- for _i10 in xrange(_size6):
- _elem11 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem11.read(iprot)
- self.processOutputs.append(_elem11)
+ (_etype15, _size12) = iprot.readListBegin()
+ for _i16 in xrange(_size12):
+ _elem17 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem17.read(iprot)
+ self.processOutputs.append(_elem17)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 12:
if ftype == TType.STRUCT:
- self.resourceSchedule = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
- self.resourceSchedule.read(iprot)
+ self.processResourceSchedule = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
+ self.processResourceSchedule.read(iprot)
else:
iprot.skip(ftype)
elif fid == 13:
if ftype == TType.LIST:
self.tasks = []
- (_etype15, _size12) = iprot.readListBegin()
- for _i16 in xrange(_size12):
- _elem17 = apache.airavata.model.task.ttypes.TaskModel()
- _elem17.read(iprot)
- self.tasks.append(_elem17)
+ (_etype21, _size18) = iprot.readListBegin()
+ for _i22 in xrange(_size18):
+ _elem23 = apache.airavata.model.task.ttypes.TaskModel()
+ _elem23.read(iprot)
+ self.tasks.append(_elem23)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -211,9 +216,14 @@ class ProcessModel:
else:
iprot.skip(ftype)
elif fid == 15:
- if ftype == TType.STRUCT:
- self.processError = apache.airavata.model.commons.ttypes.ErrorModel()
- self.processError.read(iprot)
+ if ftype == TType.LIST:
+ self.processError = []
+ (_etype27, _size24) = iprot.readListBegin()
+ for _i28 in xrange(_size24):
+ _elem29 = apache.airavata.model.commons.ttypes.ErrorModel()
+ _elem29.read(iprot)
+ self.processError.append(_elem29)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 16:
@@ -229,10 +239,10 @@ class ProcessModel:
elif fid == 18:
if ftype == TType.LIST:
self.emailAddresses = []
- (_etype21, _size18) = iprot.readListBegin()
- for _i22 in xrange(_size18):
- _elem23 = iprot.readString()
- self.emailAddresses.append(_elem23)
+ (_etype33, _size30) = iprot.readListBegin()
+ for _i34 in xrange(_size30):
+ _elem35 = iprot.readString()
+ self.emailAddresses.append(_elem35)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -288,8 +298,11 @@ class ProcessModel:
oprot.writeI64(self.lastUpdateTime)
oprot.writeFieldEnd()
if self.processStatus is not None:
- oprot.writeFieldBegin('processStatus', TType.STRUCT, 5)
- self.processStatus.write(oprot)
+ oprot.writeFieldBegin('processStatus', TType.LIST, 5)
+ oprot.writeListBegin(TType.STRUCT, len(self.processStatus))
+ for iter36 in self.processStatus:
+ iter36.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.processDetail is not None:
oprot.writeFieldBegin('processDetail', TType.STRING, 6)
@@ -310,26 +323,26 @@ class ProcessModel:
if self.processInputs is not None:
oprot.writeFieldBegin('processInputs', TType.LIST, 10)
oprot.writeListBegin(TType.STRUCT, len(self.processInputs))
- for iter24 in self.processInputs:
- iter24.write(oprot)
+ for iter37 in self.processInputs:
+ iter37.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.processOutputs is not None:
oprot.writeFieldBegin('processOutputs', TType.LIST, 11)
oprot.writeListBegin(TType.STRUCT, len(self.processOutputs))
- for iter25 in self.processOutputs:
- iter25.write(oprot)
+ for iter38 in self.processOutputs:
+ iter38.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.resourceSchedule is not None:
- oprot.writeFieldBegin('resourceSchedule', TType.STRUCT, 12)
- self.resourceSchedule.write(oprot)
+ if self.processResourceSchedule is not None:
+ oprot.writeFieldBegin('processResourceSchedule', TType.STRUCT, 12)
+ self.processResourceSchedule.write(oprot)
oprot.writeFieldEnd()
if self.tasks is not None:
oprot.writeFieldBegin('tasks', TType.LIST, 13)
oprot.writeListBegin(TType.STRUCT, len(self.tasks))
- for iter26 in self.tasks:
- iter26.write(oprot)
+ for iter39 in self.tasks:
+ iter39.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.taskDag is not None:
@@ -337,8 +350,11 @@ class ProcessModel:
oprot.writeString(self.taskDag)
oprot.writeFieldEnd()
if self.processError is not None:
- oprot.writeFieldBegin('processError', TType.STRUCT, 15)
- self.processError.write(oprot)
+ oprot.writeFieldBegin('processError', TType.LIST, 15)
+ oprot.writeListBegin(TType.STRUCT, len(self.processError))
+ for iter40 in self.processError:
+ iter40.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gatewayExecutionId is not None:
oprot.writeFieldBegin('gatewayExecutionId', TType.STRING, 16)
@@ -351,8 +367,8 @@ class ProcessModel:
if self.emailAddresses is not None:
oprot.writeFieldBegin('emailAddresses', TType.LIST, 18)
oprot.writeListBegin(TType.STRING, len(self.emailAddresses))
- for iter27 in self.emailAddresses:
- oprot.writeString(iter27)
+ for iter41 in self.emailAddresses:
+ oprot.writeString(iter41)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.storageResourceId is not None:
@@ -399,7 +415,7 @@ class ProcessModel:
value = (value * 31) ^ hash(self.computeResourceId)
value = (value * 31) ^ hash(self.processInputs)
value = (value * 31) ^ hash(self.processOutputs)
- value = (value * 31) ^ hash(self.resourceSchedule)
+ value = (value * 31) ^ hash(self.processResourceSchedule)
value = (value * 31) ^ hash(self.tasks)
value = (value * 31) ^ hash(self.taskDag)
value = (value * 31) ^ hash(self.processError)
[10/10] airavata git commit: adding experiment catalog new database
models
Posted by sc...@apache.org.
adding experiment catalog new database models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/570832d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/570832d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/570832d1
Branch: refs/heads/develop
Commit: 570832d1c8c76147defe510e09e1a2be83f7103b
Parents: 2b3dec8 b46fd51
Author: scnakandala <su...@gmail.com>
Authored: Wed Aug 31 15:13:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Aug 31 15:13:53 2016 -0400
----------------------------------------------------------------------
.../resources/lib/airavata/job_model_types.cpp | 86 +--
.../resources/lib/airavata/job_model_types.h | 4 +-
.../lib/airavata/process_model_types.cpp | 260 ++++++----
.../lib/airavata/process_model_types.h | 20 +-
.../resources/lib/airavata/task_model_types.cpp | 242 +++++----
.../resources/lib/airavata/task_model_types.h | 8 +-
.../lib/airavata/user_profile_model_types.cpp | 89 ++--
.../lib/airavata/user_profile_model_types.h | 7 +-
.../lib/Airavata/Model/Process/Types.php | 180 ++++---
.../resources/lib/Airavata/Model/Task/Types.php | 102 +++-
.../resources/lib/Airavata/Model/User/Types.php | 121 +++--
.../resources/lib/Airavata/Model/job/Types.php | 41 +-
.../lib/apache/airavata/model/job/ttypes.py | 20 +-
.../lib/apache/airavata/model/process/ttypes.py | 114 ++--
.../lib/apache/airavata/model/task/ttypes.py | 54 +-
.../lib/apache/airavata/model/user/ttypes.py | 117 +++--
.../org/apache/airavata/model/job/JobModel.java | 142 +++--
.../airavata/model/process/ProcessModel.java | 519 +++++++++++--------
.../apache/airavata/model/task/TaskModel.java | 302 +++++++----
.../apache/airavata/model/user/UserProfile.java | 24 +-
.../model/util/ExperimentModelUtil.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 11 +-
.../gfac/core/context/ProcessContext.java | 21 +-
.../airavata/gfac/core/context/TaskContext.java | 17 +-
.../org/apache/airavata/gfac/impl/Factory.java | 4 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 25 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 5 +-
.../gfac/impl/task/BESJobSubmissionTask.java | 10 +-
.../airavata/gfac/impl/task/DataStageTask.java | 8 +-
.../gfac/impl/task/DataStreamingTask.java | 2 +-
.../impl/task/DefaultJobSubmissionTask.java | 26 +-
.../gfac/impl/task/EnvironmentSetupTask.java | 3 +-
.../gfac/impl/task/ForkJobSubmissionTask.java | 13 +-
.../gfac/impl/task/SCPDataStageTask.java | 16 +-
.../gfac/impl/task/utils/StreamData.java | 8 +-
.../task/utils/bes/ApplicationProcessor.java | 2 +-
.../impl/task/utils/bes/ResourceProcessor.java | 2 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 4 +-
.../core/utils/OrchestratorUtils.java | 4 +-
.../validator/impl/BatchQueueValidator.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 14 +-
.../server/OrchestratorServerHandler.java | 6 +-
modules/registry-refactoring/pom.xml | 2 +-
.../org/apache/airavata/registry/core/Main.java | 75 ---
.../ComputeResourceSchedulingEntity.java | 2 +-
.../entities/expcatalog/ExperimentEntity.java | 35 +-
.../expcatalog/ExperimentErrorEntity.java | 4 +-
.../entities/expcatalog/ExperimentErrorPK.java | 75 +++
.../expcatalog/ExperimentInputEntity.java | 7 +-
.../entities/expcatalog/ExperimentInputPK.java | 74 +++
.../expcatalog/ExperimentOutputEntity.java | 24 +-
.../entities/expcatalog/ExperimentOutputPK.java | 74 +++
.../expcatalog/ExperimentStatusEntity.java | 83 +++
.../entities/expcatalog/ExperimentStatusPK.java | 74 +++
.../core/entities/expcatalog/JobEntity.java | 165 ++++++
.../entities/expcatalog/JobStatusEntity.java | 83 +++
.../core/entities/expcatalog/JobStatusPK.java | 74 +++
.../core/entities/expcatalog/ProcessEntity.java | 276 ++++++++++
.../entities/expcatalog/ProcessErrorEntity.java | 118 +++++
.../entities/expcatalog/ProcessErrorPK.java | 75 +++
.../entities/expcatalog/ProcessInputEntity.java | 174 +++++++
.../entities/expcatalog/ProcessInputPK.java | 74 +++
.../expcatalog/ProcessOutputEntity.java | 165 ++++++
.../entities/expcatalog/ProcessOutputPK.java | 70 +++
.../ProcessResourceSchedulingEntity.java | 170 ++++++
.../expcatalog/ProcessStatusEntity.java | 83 +++
.../entities/expcatalog/ProcessStatusPK.java | 74 +++
.../core/entities/expcatalog/TaskEntity.java | 147 ++++++
.../entities/expcatalog/TaskErrorEntity.java | 118 +++++
.../core/entities/expcatalog/TaskErrorPK.java | 75 +++
.../entities/expcatalog/TaskStatusEntity.java | 83 +++
.../core/entities/expcatalog/TaskStatusPK.java | 74 +++
.../expcatalog/UserConfigurationEntity.java | 2 +-
.../workspacecatalog/GatewayEntity.java | 2 +-
.../workspacecatalog/NSFDemographicsEntity.java | 2 +-
.../workspacecatalog/NotificationEntity.java | 2 +-
.../workspacecatalog/ProjectEntity.java | 2 +-
.../workspacecatalog/UserProfileEntity.java | 2 +-
.../expcatalog/ExperimentRepository.java | 101 ++++
.../expcatalog/ExperimentRespository.java | 43 --
.../src/main/resources/META-INF/persistence.xml | 17 +
.../src/main/resources/experiment_catalog.sql | 257 +++++++--
.../src/main/resources/workspace_catalog.sql | 48 +-
.../core/repositories/RepositoryTest.java | 40 ++
.../catalog/impl/ExperimentRegistry.java | 86 +--
.../utils/ThriftDataModelConversion.java | 22 +-
.../service/handler/RegistryServerHandler.java | 2 +-
.../experiment-catalog-models/job_model.thrift | 2 +-
.../process_model.thrift | 6 +-
.../experiment-catalog-models/task_model.thrift | 4 +-
.../user-group-models/user_profile_model.thrift | 35 +-
91 files changed, 4628 insertions(+), 1331 deletions(-)
----------------------------------------------------------------------
[07/10] airavata git commit: making errors and statuses list in
Process and Task models
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/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 533e719..8740737 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
@@ -386,13 +386,13 @@ public class ThriftDataModelConversion {
if (errorModel != null){
List<ErrorModel> errorModels = new ArrayList<>();
errorModels.add(errorModel);
- processModel.setProcessError(errorModels);
+ processModel.setProcessErrors(errorModels);
}
ProcessStatus processStatus = getProcessStatus(processResource.getProcessStatus());
if (processStatus != null){
List<ProcessStatus> statuses = new ArrayList<>();
statuses.add(processStatus);
- processModel.setProcessStatus(statuses);
+ processModel.setProcessStatuses(statuses);
}
ComputationalResourceSchedulingModel schedule = getProcessResourceSchedule(processResource.getProcessResourceSchedule());
@@ -431,11 +431,15 @@ public class ThriftDataModelConversion {
TaskStatus taskStatus = getTaskStatus(taskResource.getTaskStatus());
if (taskStatus != null){
- model.setTaskStatus(taskStatus);
+ List<TaskStatus> taskStatuses = new ArrayList<>();
+ taskStatuses.add(taskStatus);
+ model.setTaskStatuses(taskStatuses);
}
ErrorModel errorModel = getErrorModel(taskResource.getTaskError());
if (errorModel != null) {
- model.setTaskError(errorModel);
+ List<ErrorModel> errors = new ArrayList<>();
+ errors.add(errorModel);
+ model.setTaskErrors(errors);
}
return model;
@@ -453,7 +457,9 @@ public class ThriftDataModelConversion {
model.setWorkingDir(jobResource.getWorkingDir());
JobStatus jobStatus = getJobStatus(jobResource.getJobStatus());
if (jobStatus != null){
- model.setJobStatus(jobStatus);
+ List<JobStatus> jobStatuses = new ArrayList<>();
+ jobStatuses.add(jobStatus);
+ model.setJobStatuses(jobStatuses);
}
model.setExitCode(jobResource.getExitCode());
model.setStdOut(jobResource.getStdOut());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index 67344d7..076208d 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -720,7 +720,7 @@ public class RegistryServerHandler implements RegistryService.Iface {
for (Object jobObject : jobs) {
JobModel jobModel = (JobModel) jobObject;
String jobID = jobModel.getJobId();
- JobStatus status = jobModel.getJobStatus();
+ JobStatus status = jobModel.getJobStatuses().get(0);
if (status != null){
jobStatus.put(jobID, status);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift
index f908c5e..9e7154e 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift
@@ -31,7 +31,7 @@ struct JobModel {
3: required string processId,
4: required string jobDescription,
5: optional i64 creationTime,
- 6: optional status_models.JobStatus jobStatus,
+ 6: optional list<status_models.JobStatus> jobStatuses,
7: optional string computeResourceConsumed,
8: optional string jobName,
9: optional string workingDir,
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
index 0a72923..ac78837 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift
@@ -44,7 +44,7 @@ struct ProcessModel {
2: required string experimentId,
3: optional i64 creationTime,
4: optional i64 lastUpdateTime,
- 5: optional list<status_models.ProcessStatus> processStatus,
+ 5: optional list<status_models.ProcessStatus> processStatuses,
6: optional string processDetail,
7: optional string applicationInterfaceId,
8: optional string applicationDeploymentId,
@@ -54,7 +54,7 @@ struct ProcessModel {
12: optional scheduling_model.ComputationalResourceSchedulingModel processResourceSchedule,
13: optional list<task_model.TaskModel> tasks,
14: optional string taskDag,
- 15: optional list<airavata_commons.ErrorModel> processError,
+ 15: optional list<airavata_commons.ErrorModel> processErrors,
16: optional string gatewayExecutionId,
17: optional bool enableEmailNotification,
18: optional list<string> emailAddresses,
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift
index faaf93b..1d95d01 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift
@@ -58,10 +58,10 @@ struct TaskModel {
3: required string parentProcessId,
4: required i64 creationTime,
5: required i64 lastUpdateTime,
- 6: required status_models.TaskStatus taskStatus,
+ 6: required list<status_models.TaskStatus> taskStatuses,
7: optional string taskDetail,
8: optional binary subTaskModel,
- 9: optional airavata_commons.ErrorModel taskError,
+ 9: optional list<airavata_commons.ErrorModel> taskErrors,
10: optional list<job_model.JobModel> jobs
}