You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/14 14:32:34 UTC
[2/8] airavata git commit: Removed archive flag from experiment and
use app catalog archive flag
Removed archive flag from experiment and use app catalog archive flag
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/59655604
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/59655604
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/59655604
Branch: refs/heads/master
Commit: 59655604842a7753c313ca12fe618d78791a4630
Parents: bb3331f
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Mar 11 12:40:08 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Mar 11 12:40:08 2016 -0500
----------------------------------------------------------------------
.../lib/airavata/experiment_model_types.cpp | 22 ----
.../lib/airavata/experiment_model_types.h | 12 +--
.../gateway_resource_profile_model_types.cpp | 22 ----
.../gateway_resource_profile_model_types.h | 12 +--
.../lib/airavata/process_model_types.cpp | 22 ----
.../lib/airavata/process_model_types.h | 12 +--
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ----
.../lib/Airavata/Model/Experiment/Types.php | 23 ----
.../lib/Airavata/Model/Process/Types.php | 23 ----
.../model/appcatalog/gatewayprofile/ttypes.py | 15 +--
.../apache/airavata/model/experiment/ttypes.py | 15 +--
.../lib/apache/airavata/model/process/ttypes.py | 15 +--
.../model/experiment/ExperimentModel.java | 107 +------------------
.../airavata/model/process/ProcessModel.java | 107 +------------------
.../model/util/ExperimentModelUtil.java | 1 -
.../gfac/core/context/ProcessContext.java | 3 -
.../cpi/impl/SimpleOrchestratorImpl.java | 16 ++-
.../catalog/impl/ExperimentRegistry.java | 4 -
.../experiment/catalog/model/Experiment.java | 10 --
.../core/experiment/catalog/model/Process.java | 10 --
.../catalog/resources/ExperimentResource.java | 10 --
.../catalog/resources/ProcessResource.java | 10 --
.../experiment/catalog/resources/Utils.java | 6 --
.../utils/ThriftDataModelConversion.java | 2 -
.../src/main/resources/expcatalog-derby.sql | 1 -
.../src/main/resources/expcatalog-mysql.sql | 1 -
.../experiment_model.thrift | 5 +-
.../process_model.thrift | 3 +-
28 files changed, 34 insertions(+), 478 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
index 5ff671f..d63d93a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
@@ -420,11 +420,6 @@ void ExperimentModel::__set_processes(const std::vector< ::apache::airavata::mod
__isset.processes = true;
}
-void ExperimentModel::__set_archive(const bool val) {
- this->archive = val;
-__isset.archive = true;
-}
-
uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -666,14 +661,6 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 20:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->archive);
- this->__isset.archive = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -832,11 +819,6 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.archive) {
- xfer += oprot->writeFieldBegin("archive", ::apache::thrift::protocol::T_BOOL, 20);
- xfer += oprot->writeBool(this->archive);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -863,7 +845,6 @@ void swap(ExperimentModel &a, ExperimentModel &b) {
swap(a.experimentStatus, b.experimentStatus);
swap(a.errors, b.errors);
swap(a.processes, b.processes);
- swap(a.archive, b.archive);
swap(a.__isset, b.__isset);
}
@@ -887,7 +868,6 @@ ExperimentModel::ExperimentModel(const ExperimentModel& other33) {
experimentStatus = other33.experimentStatus;
errors = other33.errors;
processes = other33.processes;
- archive = other33.archive;
__isset = other33.__isset;
}
ExperimentModel& ExperimentModel::operator=(const ExperimentModel& other34) {
@@ -910,7 +890,6 @@ ExperimentModel& ExperimentModel::operator=(const ExperimentModel& other34) {
experimentStatus = other34.experimentStatus;
errors = other34.errors;
processes = other34.processes;
- archive = other34.archive;
__isset = other34.__isset;
return *this;
}
@@ -936,7 +915,6 @@ void ExperimentModel::printTo(std::ostream& out) const {
out << ", " << "experimentStatus="; (__isset.experimentStatus ? (out << to_string(experimentStatus)) : (out << "<null>"));
out << ", " << "errors="; (__isset.errors ? (out << to_string(errors)) : (out << "<null>"));
out << ", " << "processes="; (__isset.processes ? (out << to_string(processes)) : (out << "<null>"));
- out << ", " << "archive="; (__isset.archive ? (out << to_string(archive)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
index 05858ce..a283fc6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
@@ -179,7 +179,7 @@ inline std::ostream& operator<<(std::ostream& out, const UserConfigurationDataMo
}
typedef struct _ExperimentModel__isset {
- _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), gatewayInstanceId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false), processes(false), archive(false) {}
+ _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), gatewayInstanceId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false), processes(false) {}
bool creationTime :1;
bool description :1;
bool executionId :1;
@@ -193,7 +193,6 @@ typedef struct _ExperimentModel__isset {
bool experimentStatus :1;
bool errors :1;
bool processes :1;
- bool archive :1;
} _ExperimentModel__isset;
class ExperimentModel {
@@ -201,7 +200,7 @@ class ExperimentModel {
ExperimentModel(const ExperimentModel&);
ExperimentModel& operator=(const ExperimentModel&);
- ExperimentModel() : experimentId("DO_NOT_SET_AT_CLIENTS"), projectId(), gatewayId(), experimentType((ExperimentType::type)0), userName(), experimentName(), creationTime(0), description(), executionId(), gatewayExecutionId(), gatewayInstanceId(), enableEmailNotification(0), archive(0) {
+ ExperimentModel() : experimentId("DO_NOT_SET_AT_CLIENTS"), projectId(), gatewayId(), experimentType((ExperimentType::type)0), userName(), experimentName(), creationTime(0), description(), executionId(), gatewayExecutionId(), gatewayInstanceId(), enableEmailNotification(0) {
experimentType = (ExperimentType::type)0;
}
@@ -226,7 +225,6 @@ class ExperimentModel {
::apache::airavata::model::status::ExperimentStatus experimentStatus;
std::vector< ::apache::airavata::model::commons::ErrorModel> errors;
std::vector< ::apache::airavata::model::process::ProcessModel> processes;
- bool archive;
_ExperimentModel__isset __isset;
@@ -268,8 +266,6 @@ class ExperimentModel {
void __set_processes(const std::vector< ::apache::airavata::model::process::ProcessModel> & val);
- void __set_archive(const bool val);
-
bool operator == (const ExperimentModel & rhs) const
{
if (!(experimentId == rhs.experimentId))
@@ -336,10 +332,6 @@ class ExperimentModel {
return false;
else if (__isset.processes && !(processes == rhs.processes))
return false;
- if (__isset.archive != rhs.__isset.archive)
- return false;
- else if (__isset.archive && !(archive == rhs.archive))
- return false;
return true;
}
bool operator != (const ExperimentModel &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index ca9c2e4..544b525 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -501,11 +501,6 @@ void GatewayResourceProfile::__set_storagePreferences(const std::vector<StorageP
__isset.storagePreferences = true;
}
-void GatewayResourceProfile::__set_usageReportingGatewayId(const std::string& val) {
- this->usageReportingGatewayId = val;
-__isset.usageReportingGatewayId = true;
-}
-
uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -584,14 +579,6 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
xfer += iprot->skip(ftype);
}
break;
- case 5:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->usageReportingGatewayId);
- this->__isset.usageReportingGatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -646,11 +633,6 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.usageReportingGatewayId) {
- xfer += oprot->writeFieldBegin("usageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 5);
- xfer += oprot->writeString(this->usageReportingGatewayId);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -662,7 +644,6 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
swap(a.storagePreferences, b.storagePreferences);
- swap(a.usageReportingGatewayId, b.usageReportingGatewayId);
swap(a.__isset, b.__isset);
}
@@ -671,7 +652,6 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
storagePreferences = other18.storagePreferences;
- usageReportingGatewayId = other18.usageReportingGatewayId;
__isset = other18.__isset;
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
@@ -679,7 +659,6 @@ GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceP
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
storagePreferences = other19.storagePreferences;
- usageReportingGatewayId = other19.usageReportingGatewayId;
__isset = other19.__isset;
return *this;
}
@@ -690,7 +669,6 @@ void GatewayResourceProfile::printTo(std::ostream& out) const {
out << ", " << "credentialStoreToken="; (__isset.credentialStoreToken ? (out << to_string(credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (__isset.computeResourcePreferences ? (out << to_string(computeResourcePreferences)) : (out << "<null>"));
out << ", " << "storagePreferences="; (__isset.storagePreferences ? (out << to_string(storagePreferences)) : (out << "<null>"));
- out << ", " << "usageReportingGatewayId="; (__isset.usageReportingGatewayId ? (out << to_string(usageReportingGatewayId)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index 447bad9..e570976 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -228,11 +228,10 @@ inline std::ostream& operator<<(std::ostream& out, const StoragePreference& obj)
}
typedef struct _GatewayResourceProfile__isset {
- _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false), usageReportingGatewayId(false) {}
+ _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false) {}
bool credentialStoreToken :1;
bool computeResourcePreferences :1;
bool storagePreferences :1;
- bool usageReportingGatewayId :1;
} _GatewayResourceProfile__isset;
class GatewayResourceProfile {
@@ -240,7 +239,7 @@ class GatewayResourceProfile {
GatewayResourceProfile(const GatewayResourceProfile&);
GatewayResourceProfile& operator=(const GatewayResourceProfile&);
- GatewayResourceProfile() : gatewayID(), credentialStoreToken(), usageReportingGatewayId() {
+ GatewayResourceProfile() : gatewayID(), credentialStoreToken() {
}
virtual ~GatewayResourceProfile() throw();
@@ -248,7 +247,6 @@ class GatewayResourceProfile {
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
std::vector<StoragePreference> storagePreferences;
- std::string usageReportingGatewayId;
_GatewayResourceProfile__isset __isset;
@@ -260,8 +258,6 @@ class GatewayResourceProfile {
void __set_storagePreferences(const std::vector<StoragePreference> & val);
- void __set_usageReportingGatewayId(const std::string& val);
-
bool operator == (const GatewayResourceProfile & rhs) const
{
if (!(gatewayID == rhs.gatewayID))
@@ -278,10 +274,6 @@ class GatewayResourceProfile {
return false;
else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
return false;
- if (__isset.usageReportingGatewayId != rhs.__isset.usageReportingGatewayId)
- return false;
- else if (__isset.usageReportingGatewayId && !(usageReportingGatewayId == rhs.usageReportingGatewayId))
- return false;
return true;
}
bool operator != (const GatewayResourceProfile &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 fa5d0c8..629b78f 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
@@ -143,11 +143,6 @@ void ProcessModel::__set_experimentDataDir(const std::string& val) {
__isset.experimentDataDir = true;
}
-void ProcessModel::__set_archive(const bool val) {
- this->archive = val;
-__isset.archive = true;
-}
-
uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -395,14 +390,6 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 23:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->archive);
- this->__isset.archive = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -564,11 +551,6 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->experimentDataDir);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.archive) {
- xfer += oprot->writeFieldBegin("archive", ::apache::thrift::protocol::T_BOOL, 23);
- xfer += oprot->writeBool(this->archive);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -598,7 +580,6 @@ void swap(ProcessModel &a, ProcessModel &b) {
swap(a.userDn, b.userDn);
swap(a.generateCert, b.generateCert);
swap(a.experimentDataDir, b.experimentDataDir);
- swap(a.archive, b.archive);
swap(a.__isset, b.__isset);
}
@@ -625,7 +606,6 @@ ProcessModel::ProcessModel(const ProcessModel& other24) {
userDn = other24.userDn;
generateCert = other24.generateCert;
experimentDataDir = other24.experimentDataDir;
- archive = other24.archive;
__isset = other24.__isset;
}
ProcessModel& ProcessModel::operator=(const ProcessModel& other25) {
@@ -651,7 +631,6 @@ ProcessModel& ProcessModel::operator=(const ProcessModel& other25) {
userDn = other25.userDn;
generateCert = other25.generateCert;
experimentDataDir = other25.experimentDataDir;
- archive = other25.archive;
__isset = other25.__isset;
return *this;
}
@@ -680,7 +659,6 @@ void ProcessModel::printTo(std::ostream& out) const {
out << ", " << "userDn="; (__isset.userDn ? (out << to_string(userDn)) : (out << "<null>"));
out << ", " << "generateCert="; (__isset.generateCert ? (out << to_string(generateCert)) : (out << "<null>"));
out << ", " << "experimentDataDir="; (__isset.experimentDataDir ? (out << to_string(experimentDataDir)) : (out << "<null>"));
- out << ", " << "archive="; (__isset.archive ? (out << to_string(archive)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 b459e5a..efa30d1 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), archive(false) {}
+ _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) {}
bool creationTime :1;
bool lastUpdateTime :1;
bool processStatus :1;
@@ -65,7 +65,6 @@ typedef struct _ProcessModel__isset {
bool userDn :1;
bool generateCert :1;
bool experimentDataDir :1;
- bool archive :1;
} _ProcessModel__isset;
class ProcessModel {
@@ -73,7 +72,7 @@ class ProcessModel {
ProcessModel(const ProcessModel&);
ProcessModel& operator=(const ProcessModel&);
- ProcessModel() : processId("DO_NOT_SET_AT_CLIENTS"), experimentId(), creationTime(0), lastUpdateTime(0), processDetail(), applicationInterfaceId(), applicationDeploymentId(), computeResourceId(), taskDag(), gatewayExecutionId(), enableEmailNotification(0), storageResourceId(), userDn(), generateCert(false), experimentDataDir(), archive(0) {
+ ProcessModel() : processId("DO_NOT_SET_AT_CLIENTS"), experimentId(), creationTime(0), lastUpdateTime(0), processDetail(), applicationInterfaceId(), applicationDeploymentId(), computeResourceId(), taskDag(), gatewayExecutionId(), enableEmailNotification(0), storageResourceId(), userDn(), generateCert(false), experimentDataDir() {
}
virtual ~ProcessModel() throw();
@@ -99,7 +98,6 @@ class ProcessModel {
std::string userDn;
bool generateCert;
std::string experimentDataDir;
- bool archive;
_ProcessModel__isset __isset;
@@ -147,8 +145,6 @@ class ProcessModel {
void __set_experimentDataDir(const std::string& val);
- void __set_archive(const bool val);
-
bool operator == (const ProcessModel & rhs) const
{
if (!(processId == rhs.processId))
@@ -235,10 +231,6 @@ class ProcessModel {
return false;
else if (__isset.experimentDataDir && !(experimentDataDir == rhs.experimentDataDir))
return false;
- if (__isset.archive != rhs.__isset.archive)
- return false;
- else if (__isset.archive && !(archive == rhs.archive))
- return false;
return true;
}
bool operator != (const ProcessModel &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 52a5a43..7f0d412 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -509,10 +509,6 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
- /**
- * @var string
- */
- public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -543,10 +539,6 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
- 5 => array(
- 'var' => 'usageReportingGatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -562,9 +554,6 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['usageReportingGatewayId'])) {
- $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
- }
}
}
@@ -637,13 +626,6 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->usageReportingGatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -701,11 +683,6 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->usageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->usageReportingGatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
index 0335092..20587b6 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
@@ -409,10 +409,6 @@ class ExperimentModel {
* @var \Airavata\Model\Process\ProcessModel[]
*/
public $processes = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -519,10 +515,6 @@ class ExperimentModel {
'class' => '\Airavata\Model\Process\ProcessModel',
),
),
- 20 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -583,9 +575,6 @@ class ExperimentModel {
if (isset($vals['processes'])) {
$this->processes = $vals['processes'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -797,13 +786,6 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 20:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -978,11 +960,6 @@ class ExperimentModel {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 20);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 41187c5..c0000d0 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
@@ -117,10 +117,6 @@ class ProcessModel {
* @var string
*/
public $experimentDataDir = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -235,10 +231,6 @@ class ProcessModel {
'var' => 'experimentDataDir',
'type' => TType::STRING,
),
- 23 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -308,9 +300,6 @@ class ProcessModel {
if (isset($vals['experimentDataDir'])) {
$this->experimentDataDir = $vals['experimentDataDir'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -533,13 +522,6 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
- case 23:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -720,11 +702,6 @@ class ProcessModel {
$xfer += $output->writeString($this->experimentDataDir);
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 23);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index defb541..9755340 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -364,7 +364,6 @@ class GatewayResourceProfile:
- credentialStoreToken
- computeResourcePreferences
- storagePreferences
- - usageReportingGatewayId
"""
thrift_spec = (
@@ -373,15 +372,13 @@ class GatewayResourceProfile:
(2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
(3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
(4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
- (5, TType.STRING, 'usageReportingGatewayId', None, None, ), # 5
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None, usageReportingGatewayId=None,):
+ def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None,):
self.gatewayID = gatewayID
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
self.storagePreferences = storagePreferences
- self.usageReportingGatewayId = usageReportingGatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -424,11 +421,6 @@ class GatewayResourceProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.STRING:
- self.usageReportingGatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -461,10 +453,6 @@ class GatewayResourceProfile:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.usageReportingGatewayId is not None:
- oprot.writeFieldBegin('usageReportingGatewayId', TType.STRING, 5)
- oprot.writeString(self.usageReportingGatewayId)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -480,7 +468,6 @@ class GatewayResourceProfile:
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
value = (value * 31) ^ hash(self.storagePreferences)
- value = (value * 31) ^ hash(self.usageReportingGatewayId)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
index 421e9c4..afc6510 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
@@ -281,7 +281,6 @@ class ExperimentModel:
- experimentStatus
- errors
- processes
- - archive
"""
thrift_spec = (
@@ -305,10 +304,9 @@ class ExperimentModel:
(17, TType.STRUCT, 'experimentStatus', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 17
(18, TType.LIST, 'errors', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 18
(19, TType.LIST, 'processes', (TType.STRUCT,(apache.airavata.model.process.ttypes.ProcessModel, apache.airavata.model.process.ttypes.ProcessModel.thrift_spec)), None, ), # 19
- (20, TType.BOOL, 'archive', None, None, ), # 20
)
- def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, gatewayInstanceId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None, archive=None,):
+ def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, gatewayInstanceId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None,):
self.experimentId = experimentId
self.projectId = projectId
self.gatewayId = gatewayId
@@ -328,7 +326,6 @@ class ExperimentModel:
self.experimentStatus = experimentStatus
self.errors = errors
self.processes = processes
- self.archive = archive
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -465,11 +462,6 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 20:
- if ftype == TType.BOOL:
- self.archive = iprot.readBool()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -571,10 +563,6 @@ class ExperimentModel:
iter34.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.archive is not None:
- oprot.writeFieldBegin('archive', TType.BOOL, 20)
- oprot.writeBool(self.archive)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -615,7 +603,6 @@ class ExperimentModel:
value = (value * 31) ^ hash(self.experimentStatus)
value = (value * 31) ^ hash(self.errors)
value = (value * 31) ^ hash(self.processes)
- value = (value * 31) ^ hash(self.archive)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 d8afe65..7355759 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
@@ -56,7 +56,6 @@ class ProcessModel:
- userDn
- generateCert
- experimentDataDir
- - archive
"""
thrift_spec = (
@@ -83,10 +82,9 @@ class ProcessModel:
(20, TType.STRING, 'userDn', None, None, ), # 20
(21, TType.BOOL, 'generateCert', None, False, ), # 21
(22, TType.STRING, 'experimentDataDir', None, None, ), # 22
- (23, TType.BOOL, 'archive', 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, archive=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, 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,):
self.processId = processId
self.experimentId = experimentId
self.creationTime = creationTime
@@ -109,7 +107,6 @@ class ProcessModel:
self.userDn = userDn
self.generateCert = generateCert
self.experimentDataDir = experimentDataDir
- self.archive = archive
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -256,11 +253,6 @@ class ProcessModel:
self.experimentDataDir = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 23:
- if ftype == TType.BOOL:
- self.archive = iprot.readBool()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -371,10 +363,6 @@ class ProcessModel:
oprot.writeFieldBegin('experimentDataDir', TType.STRING, 22)
oprot.writeString(self.experimentDataDir)
oprot.writeFieldEnd()
- if self.archive is not None:
- oprot.writeFieldBegin('archive', TType.BOOL, 23)
- oprot.writeBool(self.archive)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -410,7 +398,6 @@ class ProcessModel:
value = (value * 31) ^ hash(self.userDn)
value = (value * 31) ^ hash(self.generateCert)
value = (value * 31) ^ hash(self.experimentDataDir)
- value = (value * 31) ^ hash(self.archive)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 461c584..7729612 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -90,7 +90,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)17);
private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)18);
private static final org.apache.thrift.protocol.TField PROCESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("processes", org.apache.thrift.protocol.TType.LIST, (short)19);
- private static final org.apache.thrift.protocol.TField ARCHIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("archive", org.apache.thrift.protocol.TType.BOOL, (short)20);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -117,7 +116,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private org.apache.airavata.model.status.ExperimentStatus experimentStatus; // optional
private List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
private List<org.apache.airavata.model.process.ProcessModel> processes; // optional
- private boolean archive; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -143,8 +141,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
EXPERIMENT_OUTPUTS((short)16, "experimentOutputs"),
EXPERIMENT_STATUS((short)17, "experimentStatus"),
ERRORS((short)18, "errors"),
- PROCESSES((short)19, "processes"),
- ARCHIVE((short)20, "archive");
+ PROCESSES((short)19, "processes");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -197,8 +194,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return ERRORS;
case 19: // PROCESSES
return PROCESSES;
- case 20: // ARCHIVE
- return ARCHIVE;
default:
return null;
}
@@ -241,9 +236,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
// isset id assignments
private static final int __CREATIONTIME_ISSET_ID = 0;
private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 1;
- private static final int __ARCHIVE_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.GATEWAY_INSTANCE_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES,_Fields.ARCHIVE};
+ private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.GATEWAY_INSTANCE_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -290,8 +284,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
tmpMap.put(_Fields.PROCESSES, new org.apache.thrift.meta_data.FieldMetaData("processes", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.process.ProcessModel.class))));
- tmpMap.put(_Fields.ARCHIVE, new org.apache.thrift.meta_data.FieldMetaData("archive", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExperimentModel.class, metaDataMap);
}
@@ -395,7 +387,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
this.processes = __this__processes;
}
- this.archive = other.archive;
}
public ExperimentModel deepCopy() {
@@ -427,8 +418,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
this.experimentStatus = null;
this.errors = null;
this.processes = null;
- setArchiveIsSet(false);
- this.archive = false;
}
public String getExperimentId() {
@@ -949,28 +938,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
}
- public boolean isArchive() {
- return this.archive;
- }
-
- public void setArchive(boolean archive) {
- this.archive = archive;
- setArchiveIsSet(true);
- }
-
- public void unsetArchive() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ARCHIVE_ISSET_ID);
- }
-
- /** Returns true if field archive is set (has been assigned a value) and false otherwise */
- public boolean isSetArchive() {
- return EncodingUtils.testBit(__isset_bitfield, __ARCHIVE_ISSET_ID);
- }
-
- public void setArchiveIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ARCHIVE_ISSET_ID, value);
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case EXPERIMENT_ID:
@@ -1125,14 +1092,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
break;
- case ARCHIVE:
- if (value == null) {
- unsetArchive();
- } else {
- setArchive((Boolean)value);
- }
- break;
-
}
}
@@ -1195,9 +1154,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
case PROCESSES:
return getProcesses();
- case ARCHIVE:
- return isArchive();
-
}
throw new IllegalStateException();
}
@@ -1247,8 +1203,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return isSetErrors();
case PROCESSES:
return isSetProcesses();
- case ARCHIVE:
- return isSetArchive();
}
throw new IllegalStateException();
}
@@ -1437,15 +1391,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return false;
}
- boolean this_present_archive = true && this.isSetArchive();
- boolean that_present_archive = true && that.isSetArchive();
- if (this_present_archive || that_present_archive) {
- if (!(this_present_archive && that_present_archive))
- return false;
- if (this.archive != that.archive)
- return false;
- }
-
return true;
}
@@ -1548,11 +1493,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (present_processes)
list.add(processes);
- boolean present_archive = true && (isSetArchive());
- list.add(present_archive);
- if (present_archive)
- list.add(archive);
-
return list.hashCode();
}
@@ -1754,16 +1694,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetArchive()).compareTo(other.isSetArchive());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetArchive()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.archive, other.archive);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -1953,12 +1883,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
first = false;
}
- if (isSetArchive()) {
- if (!first) sb.append(", ");
- sb.append("archive:");
- sb.append(this.archive);
- first = false;
- }
sb.append(")");
return sb.toString();
}
@@ -2242,14 +2166,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 20: // ARCHIVE
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.archive = iprot.readBool();
- struct.setArchiveIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2415,11 +2331,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldEnd();
}
}
- if (struct.isSetArchive()) {
- oprot.writeFieldBegin(ARCHIVE_FIELD_DESC);
- oprot.writeBool(struct.archive);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -2483,10 +2394,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetProcesses()) {
optionals.set(12);
}
- if (struct.isSetArchive()) {
- optionals.set(13);
- }
- oprot.writeBitSet(optionals, 14);
+ oprot.writeBitSet(optionals, 13);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -2556,9 +2464,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
}
}
- if (struct.isSetArchive()) {
- oprot.writeBool(struct.archive);
- }
}
@Override
@@ -2576,7 +2481,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setUserNameIsSet(true);
struct.experimentName = iprot.readString();
struct.setExperimentNameIsSet(true);
- BitSet incoming = iprot.readBitSet(14);
+ BitSet incoming = iprot.readBitSet(13);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -2680,10 +2585,6 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
struct.setProcessesIsSet(true);
}
- if (incoming.get(13)) {
- struct.archive = iprot.readBool();
- struct.setArchiveIsSet(true);
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 09ad640..81be6d2 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
@@ -86,7 +86,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final org.apache.thrift.protocol.TField USER_DN_FIELD_DESC = new org.apache.thrift.protocol.TField("userDn", org.apache.thrift.protocol.TType.STRING, (short)20);
private static final org.apache.thrift.protocol.TField GENERATE_CERT_FIELD_DESC = new org.apache.thrift.protocol.TField("generateCert", org.apache.thrift.protocol.TType.BOOL, (short)21);
private static final org.apache.thrift.protocol.TField EXPERIMENT_DATA_DIR_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentDataDir", org.apache.thrift.protocol.TType.STRING, (short)22);
- private static final org.apache.thrift.protocol.TField ARCHIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("archive", org.apache.thrift.protocol.TType.BOOL, (short)23);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -116,7 +115,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private String userDn; // optional
private boolean generateCert; // optional
private String experimentDataDir; // optional
- private boolean archive; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -141,8 +139,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
STORAGE_RESOURCE_ID((short)19, "storageResourceId"),
USER_DN((short)20, "userDn"),
GENERATE_CERT((short)21, "generateCert"),
- EXPERIMENT_DATA_DIR((short)22, "experimentDataDir"),
- ARCHIVE((short)23, "archive");
+ EXPERIMENT_DATA_DIR((short)22, "experimentDataDir");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -201,8 +198,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return GENERATE_CERT;
case 22: // EXPERIMENT_DATA_DIR
return EXPERIMENT_DATA_DIR;
- case 23: // ARCHIVE
- return ARCHIVE;
default:
return null;
}
@@ -247,9 +242,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private static final int __LASTUPDATETIME_ISSET_ID = 1;
private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 2;
private static final int __GENERATECERT_ISSET_ID = 3;
- private static final int __ARCHIVE_ISSET_ID = 4;
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.ARCHIVE};
+ 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};
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);
@@ -301,8 +295,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.EXPERIMENT_DATA_DIR, new org.apache.thrift.meta_data.FieldMetaData("experimentDataDir", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.ARCHIVE, new org.apache.thrift.meta_data.FieldMetaData("archive", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ProcessModel.class, metaDataMap);
}
@@ -399,7 +391,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (other.isSetExperimentDataDir()) {
this.experimentDataDir = other.experimentDataDir;
}
- this.archive = other.archive;
}
public ProcessModel deepCopy() {
@@ -435,8 +426,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.generateCert = false;
this.experimentDataDir = null;
- setArchiveIsSet(false);
- this.archive = false;
}
public String getProcessId() {
@@ -1001,28 +990,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
}
- public boolean isArchive() {
- return this.archive;
- }
-
- public void setArchive(boolean archive) {
- this.archive = archive;
- setArchiveIsSet(true);
- }
-
- public void unsetArchive() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ARCHIVE_ISSET_ID);
- }
-
- /** Returns true if field archive is set (has been assigned a value) and false otherwise */
- public boolean isSetArchive() {
- return EncodingUtils.testBit(__isset_bitfield, __ARCHIVE_ISSET_ID);
- }
-
- public void setArchiveIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ARCHIVE_ISSET_ID, value);
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PROCESS_ID:
@@ -1201,14 +1168,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
break;
- case ARCHIVE:
- if (value == null) {
- unsetArchive();
- } else {
- setArchive((Boolean)value);
- }
- break;
-
}
}
@@ -1280,9 +1239,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case EXPERIMENT_DATA_DIR:
return getExperimentDataDir();
- case ARCHIVE:
- return isArchive();
-
}
throw new IllegalStateException();
}
@@ -1338,8 +1294,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return isSetGenerateCert();
case EXPERIMENT_DATA_DIR:
return isSetExperimentDataDir();
- case ARCHIVE:
- return isSetArchive();
}
throw new IllegalStateException();
}
@@ -1555,15 +1509,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return false;
}
- boolean this_present_archive = true && this.isSetArchive();
- boolean that_present_archive = true && that.isSetArchive();
- if (this_present_archive || that_present_archive) {
- if (!(this_present_archive && that_present_archive))
- return false;
- if (this.archive != that.archive)
- return false;
- }
-
return true;
}
@@ -1681,11 +1626,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (present_experimentDataDir)
list.add(experimentDataDir);
- boolean present_archive = true && (isSetArchive());
- list.add(present_archive);
- if (present_archive)
- list.add(archive);
-
return list.hashCode();
}
@@ -1917,16 +1857,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetArchive()).compareTo(other.isSetArchive());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetArchive()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.archive, other.archive);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -2146,12 +2076,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
first = false;
}
- if (isSetArchive()) {
- if (!first) sb.append(", ");
- sb.append("archive:");
- sb.append(this.archive);
- first = false;
- }
sb.append(")");
return sb.toString();
}
@@ -2436,14 +2360,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 23: // ARCHIVE
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.archive = iprot.readBool();
- struct.setArchiveIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2627,11 +2543,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldEnd();
}
}
- if (struct.isSetArchive()) {
- oprot.writeFieldBegin(ARCHIVE_FIELD_DESC);
- oprot.writeBool(struct.archive);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -2712,10 +2623,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetExperimentDataDir()) {
optionals.set(19);
}
- if (struct.isSetArchive()) {
- optionals.set(20);
- }
- oprot.writeBitSet(optionals, 21);
+ oprot.writeBitSet(optionals, 20);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -2800,9 +2708,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetExperimentDataDir()) {
oprot.writeString(struct.experimentDataDir);
}
- if (struct.isSetArchive()) {
- oprot.writeBool(struct.archive);
- }
}
@Override
@@ -2812,7 +2717,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
struct.setProcessIdIsSet(true);
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
- BitSet incoming = iprot.readBitSet(21);
+ BitSet incoming = iprot.readBitSet(20);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -2935,10 +2840,6 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
struct.experimentDataDir = iprot.readString();
struct.setExperimentDataDirIsSet(true);
}
- if (incoming.get(20)) {
- struct.archive = iprot.readBool();
- struct.setArchiveIsSet(true);
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 8546e5f..502c8ce 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
@@ -81,7 +81,6 @@ public class ExperimentModelUtil {
processModel.setExperimentId(experiment.getExperimentId());
processModel.setApplicationInterfaceId(experiment.getExecutionId());
processModel.setEnableEmailNotification(experiment.isEnableEmailNotification());
- processModel.setArchive(experiment.isArchive());
List<String> emailAddresses = experiment.getEmailAddresses();
if (emailAddresses != null && !emailAddresses.isEmpty()){
processModel.setEmailAddresses(emailAddresses);
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 2b7868c..e503bfb 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
@@ -511,8 +511,5 @@ public class ProcessContext {
this.recoveryWithCancel = recoveryWithCancel;
}
- public boolean isArchive() {
- return getProcessModel().isArchive();
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 ffcb89a..ca7be48 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
@@ -23,6 +23,7 @@ package org.apache.airavata.orchestrator.cpi.impl;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.gfac.core.task.TaskException;
+import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.application.io.DataType;
@@ -45,6 +46,7 @@ import org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter;
import org.apache.airavata.orchestrator.core.job.JobSubmitter;
import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
+import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.thrift.TException;
@@ -414,12 +416,22 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
}
}
- if (processModel.isArchive()) {
- createArchiveDataStatgingTask(processModel, gatewayId, dataStagingTaskIds);
+ try {
+ if (isArchive(processModel, gatewayId)) {
+ createArchiveDataStatgingTask(processModel, gatewayId, dataStagingTaskIds);
+ }
+ } catch (AppCatalogException e) {
+ throw new RegistryException("Error! Application interface retrieval failed");
}
return dataStagingTaskIds;
}
+ private boolean isArchive(ProcessModel processModel, String gatewayId) throws AppCatalogException {
+ AppCatalog appCatalog = RegistryFactory.getAppCatalog();
+ ApplicationInterfaceDescription appInterface = appCatalog.getApplicationInterface().getApplicationInterface(processModel.getApplicationInterfaceId());
+ return appInterface.isArchiveWorkingDirectory();
+ }
+
private void createArchiveDataStatgingTask(ProcessModel processModel, String gatewayId, List<String> dataStagingTaskIds) throws RegistryException {
TaskModel archiveTask = null;
try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 acf76d6..98dfe91 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
@@ -91,7 +91,6 @@ public class ExperimentRegistry {
experimentResource.setExecutionId(experiment.getExecutionId());
experimentResource.setGatewayExecutionId(experiment.getGatewayExecutionId());
experimentResource.setGatewayInstanceId(experiment.getGatewayInstanceId());
- experimentResource.setArchive(experiment.isArchive());
if(experiment.isEnableEmailNotification()){
experimentResource.setEnableEmailNotification(true);
if(experiment.getEmailAddresses() != null){
@@ -281,7 +280,6 @@ public class ExperimentRegistry {
processResource.setUserDn(process.getUserDn());
processResource.setGenerateCert(process.isGenerateCert());
processResource.setExperimentDataDir(process.getExperimentDataDir());
- processResource.setArchive(process.isArchive());
if(process.isEnableEmailNotification()){
processResource.setEnableEmailNotification(true);
if(process.getEmailAddresses() != null){
@@ -589,7 +587,6 @@ public class ExperimentRegistry {
existingExperiment.setDescription(experiment.getDescription());
existingExperiment.setExecutionId(experiment.getExecutionId());
existingExperiment.setEnableEmailNotification(experiment.isEnableEmailNotification());
- existingExperiment.setArchive(experiment.isArchive());
existingExperiment.save();
@@ -737,7 +734,6 @@ public class ExperimentRegistry {
processResource.setUserDn(process.getUserDn());
processResource.setGenerateCert(process.isGenerateCert());
processResource.setExperimentDataDir(process.getExperimentDataDir());
- processResource.setArchive(process.isArchive());
if(process.isEnableEmailNotification()){
processResource.setEnableEmailNotification(true);
if(process.getEmailAddresses() != null){
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
index 55505e5..c59c520 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
@@ -44,7 +44,6 @@ public class Experiment {
private String gatewayInstanceId;
private Boolean enableEmailNotification;
- private Boolean archive;
private String emailAddresses;
private Users user;
private Project project;
@@ -164,15 +163,6 @@ public class Experiment {
this.enableEmailNotification = enableEmailNotification;
}
- @Column(name = "ARCHIVE")
- public Boolean getArchive() {
- return archive;
- }
-
- public void setArchive(Boolean archive) {
- this.archive = archive;
- }
-
@Lob
@Column(name = "EMAIL_ADDRESSES")
public String getEmailAddresses() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
index a1449cc..cc777a1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
@@ -54,7 +54,6 @@ public class Process {
private Collection<Task> tasks;
private String userDn;
private boolean generateCert;
- private boolean archive;
@Id
@Column(name = "PROCESS_ID")
@@ -204,15 +203,6 @@ public class Process {
this.experimentDataDir = experimentDataDir;
}
- @Column(name = "ARCHIVE")
- public boolean isArchive() {
- return archive;
- }
-
- public void setArchive(boolean archive) {
- this.archive = archive;
- }
-
// @Override
// public boolean equals(Object o) {
// if (this == o) return true;
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
index b059706..174575f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
@@ -53,7 +53,6 @@ public class ExperimentResource extends AbstractExpCatResource {
private String gatewayInstanceId;
private boolean enableEmailNotification;
private String emailAddresses;
- private boolean archive;
public String getExperimentId() {
return experimentId;
@@ -159,14 +158,6 @@ public class ExperimentResource extends AbstractExpCatResource {
this.emailAddresses = emailAddresses;
}
- public boolean isArchive() {
- return archive;
- }
-
- public void setArchive(boolean archive) {
- this.archive = archive;
- }
-
public ExperimentCatResource create(ResourceType type) throws RegistryException{
switch (type){
case EXPERIMENT_ERROR:
@@ -528,7 +519,6 @@ public class ExperimentResource extends AbstractExpCatResource {
experiment.setGatewayExecutionId(gatewayExecutionId);
experiment.setEnableEmailNotification(enableEmailNotification);
experiment.setEmailAddresses(emailAddresses);
- experiment.setArchive(archive);
if (existingExp == null){
em.persist(experiment);
}else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
index 3918981..e1720de 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java
@@ -56,7 +56,6 @@ public class ProcessResource extends AbstractExpCatResource {
private String userDn;
private boolean generateCert;
private String experimentDataDir;
- private boolean archive;
public String getProcessId() {
return processId;
@@ -186,14 +185,6 @@ public class ProcessResource extends AbstractExpCatResource {
this.experimentDataDir = experimentDataDir;
}
- public boolean isArchive() {
- return archive;
- }
-
- public void setArchive(boolean archive) {
- this.archive = archive;
- }
-
public ExperimentCatResource create(ResourceType type) throws RegistryException{
switch (type){
case PROCESS_ERROR:
@@ -599,7 +590,6 @@ public class ProcessResource extends AbstractExpCatResource {
process.setUserDn(userDn);
process.setGenerateCert(generateCert);
process.setExperimentDataDir(experimentDataDir);
- process.setArchive(archive);
if (existingProcess == null){
em.persist(process);
}else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index 595bc63..d7b15b4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -425,11 +425,6 @@ public class Utils {
experimentResource.setGatewayInstanceId(o.getGatewayInstanceId());
experimentResource.setEnableEmailNotification(o.getEnableEmailNotification());
experimentResource.setEmailAddresses(o.getEmailAddresses());
- if(o.getArchive() == null){
- experimentResource.setArchive(false);
- }else {
- experimentResource.setArchive(o.getArchive());
- }
}
return experimentResource;
}
@@ -543,7 +538,6 @@ public class Utils {
processResource.setUserDn(o.getUserDn());
processResource.setGenerateCert(o.getGenerateCert());
processResource.setExperimentDataDir(o.getExperimentDataDir());
- processResource.setArchive(o.isArchive());
}
return processResource;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 639d83f..1eea10d 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
@@ -124,7 +124,6 @@ public class ThriftDataModelConversion {
experiment.setEnableEmailNotification(experimentResource.getEnableEmailNotification());
experiment.setGatewayExecutionId(experimentResource.getGatewayExecutionId());
experiment.setGatewayInstanceId(experimentResource.getGatewayInstanceId());
- experiment.setArchive(experimentResource.isArchive());
if (experiment.isEnableEmailNotification()){
String notificationEmails = experimentResource.getEmailAddresses();
experiment.setEmailAddresses(getEmailAddresses(notificationEmails.split(",")));
@@ -352,7 +351,6 @@ public class ThriftDataModelConversion {
processModel.setComputeResourceId(processResource.getComputeResourceId());
processModel.setEnableEmailNotification(processResource.getEnableEmailNotification());
processModel.setExperimentDataDir(processResource.getExperimentDataDir());
- processModel.setArchive(processResource.isArchive());
if (processModel.isEnableEmailNotification()){
String notificationEmails = processResource.getEmailAddresses();
processModel.setEmailAddresses(getEmailAddresses(notificationEmails.split(",")));
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index d229b06..904d37a 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -78,7 +78,6 @@ CREATE TABLE EXPERIMENT (
GATEWAY_INSTANCE_ID varchar(255),
ENABLE_EMAIL_NOTIFICATION SMALLINT,
EMAIL_ADDRESSES CLOB,
- ARCHIVE SMALLINT,
PRIMARY KEY (EXPERIMENT_ID),
FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index e06f4b0..2a2ba01 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -79,7 +79,6 @@ CREATE TABLE EXPERIMENT (
GATEWAY_EXECUTION_ID varchar(255),
ENABLE_EMAIL_NOTIFICATION tinyint(1),
EMAIL_ADDRESSES text,
- ARCHIVE TINYINT(1),
PRIMARY KEY (EXPERIMENT_ID),
FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
index c74b0cf..06879eb 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
@@ -96,9 +96,8 @@ struct ExperimentModel {
16: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
17: optional status_models.ExperimentStatus experimentStatus,
18: optional list<airavata_commons.ErrorModel> errors,
- 19: optional list<process_model.ProcessModel> processes,
- 20: optional bool archive
-}
+ 19: optional list<process_model.ProcessModel> processes
+ }
struct ExperimentSummaryModel {
1: required string experimentId,
http://git-wip-us.apache.org/repos/asf/airavata/blob/59655604/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 fa55deb..d46a7f4 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
@@ -61,6 +61,5 @@ struct ProcessModel {
19: optional string storageResourceId,
20: optional string userDn,
21: optional bool generateCert = 0,
- 22: optional string experimentDataDir,
- 23: optional bool archive
+ 22: optional string experimentDataDir
}
\ No newline at end of file