You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/11/08 17:58:00 UTC
[7/7] airavata git commit: Add useUserCRPref boolean to processModel
Add useUserCRPref boolean to processModel
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9ee4022f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9ee4022f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9ee4022f
Branch: refs/heads/develop
Commit: 9ee4022f59b5420c945cd80cff96f31d89d63d31
Parents: 4d9c56e
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Nov 8 12:31:23 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Nov 8 12:31:23 2016 -0500
----------------------------------------------------------------------
.../lib/airavata/process_model_types.cpp | 22 ++++
.../lib/airavata/process_model_types.h | 12 ++-
.../lib/Airavata/Model/Process/Types.php | 23 ++++
.../lib/apache/airavata/model/process/ttypes.py | 15 ++-
.../airavata/model/process/ProcessModel.java | 107 ++++++++++++++++++-
.../process_model.thrift | 3 +-
6 files changed, 174 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 1f72625..a2cf1a2 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
@@ -148,6 +148,11 @@ void ProcessModel::__set_userName(const std::string& val) {
__isset.userName = true;
}
+void ProcessModel::__set_useUserCRPref(const bool val) {
+ this->useUserCRPref = val;
+__isset.useUserCRPref = true;
+}
+
uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -427,6 +432,14 @@ uint32_t ProcessModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
+ case 24:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->useUserCRPref);
+ this->__isset.useUserCRPref = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -609,6 +622,11 @@ uint32_t ProcessModel::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.useUserCRPref) {
+ xfer += oprot->writeFieldBegin("useUserCRPref", ::apache::thrift::protocol::T_BOOL, 24);
+ xfer += oprot->writeBool(this->useUserCRPref);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -639,6 +657,7 @@ void swap(ProcessModel &a, ProcessModel &b) {
swap(a.generateCert, b.generateCert);
swap(a.experimentDataDir, b.experimentDataDir);
swap(a.userName, b.userName);
+ swap(a.useUserCRPref, b.useUserCRPref);
swap(a.__isset, b.__isset);
}
@@ -666,6 +685,7 @@ ProcessModel::ProcessModel(const ProcessModel& other36) {
generateCert = other36.generateCert;
experimentDataDir = other36.experimentDataDir;
userName = other36.userName;
+ useUserCRPref = other36.useUserCRPref;
__isset = other36.__isset;
}
ProcessModel& ProcessModel::operator=(const ProcessModel& other37) {
@@ -692,6 +712,7 @@ ProcessModel& ProcessModel::operator=(const ProcessModel& other37) {
generateCert = other37.generateCert;
experimentDataDir = other37.experimentDataDir;
userName = other37.userName;
+ useUserCRPref = other37.useUserCRPref;
__isset = other37.__isset;
return *this;
}
@@ -721,6 +742,7 @@ void ProcessModel::printTo(std::ostream& out) const {
out << ", " << "generateCert="; (__isset.generateCert ? (out << to_string(generateCert)) : (out << "<null>"));
out << ", " << "experimentDataDir="; (__isset.experimentDataDir ? (out << to_string(experimentDataDir)) : (out << "<null>"));
out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
+ out << ", " << "useUserCRPref="; (__isset.useUserCRPref ? (out << to_string(useUserCRPref)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 82b8113..179de33 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), processStatuses(false), processDetail(false), applicationInterfaceId(false), applicationDeploymentId(false), computeResourceId(false), processInputs(false), processOutputs(false), processResourceSchedule(false), tasks(false), taskDag(false), processErrors(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), storageResourceId(false), userDn(false), generateCert(true), experimentDataDir(false), userName(false) {}
+ _ProcessModel__isset() : creationTime(false), lastUpdateTime(false), processStatuses(false), processDetail(false), applicationInterfaceId(false), applicationDeploymentId(false), computeResourceId(false), processInputs(false), processOutputs(false), processResourceSchedule(false), tasks(false), taskDag(false), processErrors(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), storageResourceId(false), userDn(false), generateCert(true), experimentDataDir(false), userName(false), useUserCRPref(false) {}
bool creationTime :1;
bool lastUpdateTime :1;
bool processStatuses :1;
@@ -66,6 +66,7 @@ typedef struct _ProcessModel__isset {
bool generateCert :1;
bool experimentDataDir :1;
bool userName :1;
+ bool useUserCRPref :1;
} _ProcessModel__isset;
class ProcessModel {
@@ -73,7 +74,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(), userName() {
+ 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(), userName(), useUserCRPref(0) {
}
virtual ~ProcessModel() throw();
@@ -100,6 +101,7 @@ class ProcessModel {
bool generateCert;
std::string experimentDataDir;
std::string userName;
+ bool useUserCRPref;
_ProcessModel__isset __isset;
@@ -149,6 +151,8 @@ class ProcessModel {
void __set_userName(const std::string& val);
+ void __set_useUserCRPref(const bool val);
+
bool operator == (const ProcessModel & rhs) const
{
if (!(processId == rhs.processId))
@@ -239,6 +243,10 @@ class ProcessModel {
return false;
else if (__isset.userName && !(userName == rhs.userName))
return false;
+ if (__isset.useUserCRPref != rhs.__isset.useUserCRPref)
+ return false;
+ else if (__isset.useUserCRPref && !(useUserCRPref == rhs.useUserCRPref))
+ return false;
return true;
}
bool operator != (const ProcessModel &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 9e0b0b2..dc69623 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
@@ -121,6 +121,10 @@ class ProcessModel {
* @var string
*/
public $userName = null;
+ /**
+ * @var bool
+ */
+ public $useUserCRPref = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -247,6 +251,10 @@ class ProcessModel {
'var' => 'userName',
'type' => TType::STRING,
),
+ 24 => array(
+ 'var' => 'useUserCRPref',
+ 'type' => TType::BOOL,
+ ),
);
}
if (is_array($vals)) {
@@ -319,6 +327,9 @@ class ProcessModel {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
+ if (isset($vals['useUserCRPref'])) {
+ $this->useUserCRPref = $vals['useUserCRPref'];
+ }
}
}
@@ -568,6 +579,13 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
+ case 24:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->useUserCRPref);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -771,6 +789,11 @@ class ProcessModel {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
+ if ($this->useUserCRPref !== null) {
+ $xfer += $output->writeFieldBegin('useUserCRPref', TType::BOOL, 24);
+ $xfer += $output->writeBool($this->useUserCRPref);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 f5fe908..0ae58fe 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
@@ -57,6 +57,7 @@ class ProcessModel:
- generateCert
- experimentDataDir
- userName
+ - useUserCRPref
"""
thrift_spec = (
@@ -84,9 +85,10 @@ class ProcessModel:
(21, TType.BOOL, 'generateCert', None, False, ), # 21
(22, TType.STRING, 'experimentDataDir', None, None, ), # 22
(23, TType.STRING, 'userName', None, None, ), # 23
+ (24, TType.BOOL, 'useUserCRPref', None, None, ), # 24
)
- def __init__(self, processId=thrift_spec[1][4], experimentId=None, creationTime=None, lastUpdateTime=None, processStatuses=None, processDetail=None, applicationInterfaceId=None, applicationDeploymentId=None, computeResourceId=None, processInputs=None, processOutputs=None, processResourceSchedule=None, tasks=None, taskDag=None, processErrors=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, processStatuses=None, processDetail=None, applicationInterfaceId=None, applicationDeploymentId=None, computeResourceId=None, processInputs=None, processOutputs=None, processResourceSchedule=None, tasks=None, taskDag=None, processErrors=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, storageResourceId=None, userDn=None, generateCert=thrift_spec[21][4], experimentDataDir=None, userName=None, useUserCRPref=None,):
self.processId = processId
self.experimentId = experimentId
self.creationTime = creationTime
@@ -110,6 +112,7 @@ class ProcessModel:
self.generateCert = generateCert
self.experimentDataDir = experimentDataDir
self.userName = userName
+ self.useUserCRPref = useUserCRPref
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:
@@ -271,6 +274,11 @@ class ProcessModel:
self.userName = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 24:
+ if ftype == TType.BOOL:
+ self.useUserCRPref = iprot.readBool()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -391,6 +399,10 @@ class ProcessModel:
oprot.writeFieldBegin('userName', TType.STRING, 23)
oprot.writeString(self.userName)
oprot.writeFieldEnd()
+ if self.useUserCRPref is not None:
+ oprot.writeFieldBegin('useUserCRPref', TType.BOOL, 24)
+ oprot.writeBool(self.useUserCRPref)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -427,6 +439,7 @@ class ProcessModel:
value = (value * 31) ^ hash(self.generateCert)
value = (value * 31) ^ hash(self.experimentDataDir)
value = (value * 31) ^ hash(self.userName)
+ value = (value * 31) ^ hash(self.useUserCRPref)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 3454d4a..5fa77d0 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
@@ -87,6 +87,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
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 USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)23);
+ private static final org.apache.thrift.protocol.TField USE_USER_CRPREF_FIELD_DESC = new org.apache.thrift.protocol.TField("useUserCRPref", org.apache.thrift.protocol.TType.BOOL, (short)24);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -117,6 +118,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
private boolean generateCert; // optional
private String experimentDataDir; // optional
private String userName; // optional
+ private boolean useUserCRPref; // 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 {
@@ -142,7 +144,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
USER_DN((short)20, "userDn"),
GENERATE_CERT((short)21, "generateCert"),
EXPERIMENT_DATA_DIR((short)22, "experimentDataDir"),
- USER_NAME((short)23, "userName");
+ USER_NAME((short)23, "userName"),
+ USE_USER_CRPREF((short)24, "useUserCRPref");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -203,6 +206,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return EXPERIMENT_DATA_DIR;
case 23: // USER_NAME
return USER_NAME;
+ case 24: // USE_USER_CRPREF
+ return USE_USER_CRPREF;
default:
return null;
}
@@ -247,8 +252,9 @@ 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 __USEUSERCRPREF_ISSET_ID = 4;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.LAST_UPDATE_TIME,_Fields.PROCESS_STATUSES,_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_ERRORS,_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_STATUSES,_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_ERRORS,_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,_Fields.USE_USER_CRPREF};
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);
@@ -304,6 +310,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.USE_USER_CRPREF, new org.apache.thrift.meta_data.FieldMetaData("useUserCRPref", 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);
}
@@ -411,6 +419,7 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (other.isSetUserName()) {
this.userName = other.userName;
}
+ this.useUserCRPref = other.useUserCRPref;
}
public ProcessModel deepCopy() {
@@ -447,6 +456,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
this.experimentDataDir = null;
this.userName = null;
+ setUseUserCRPrefIsSet(false);
+ this.useUserCRPref = false;
}
public String getProcessId() {
@@ -1064,6 +1075,28 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
}
+ public boolean isUseUserCRPref() {
+ return this.useUserCRPref;
+ }
+
+ public void setUseUserCRPref(boolean useUserCRPref) {
+ this.useUserCRPref = useUserCRPref;
+ setUseUserCRPrefIsSet(true);
+ }
+
+ public void unsetUseUserCRPref() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USEUSERCRPREF_ISSET_ID);
+ }
+
+ /** Returns true if field useUserCRPref is set (has been assigned a value) and false otherwise */
+ public boolean isSetUseUserCRPref() {
+ return EncodingUtils.testBit(__isset_bitfield, __USEUSERCRPREF_ISSET_ID);
+ }
+
+ public void setUseUserCRPrefIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USEUSERCRPREF_ISSET_ID, value);
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PROCESS_ID:
@@ -1250,6 +1283,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
break;
+ case USE_USER_CRPREF:
+ if (value == null) {
+ unsetUseUserCRPref();
+ } else {
+ setUseUserCRPref((Boolean)value);
+ }
+ break;
+
}
}
@@ -1324,6 +1365,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
case USER_NAME:
return getUserName();
+ case USE_USER_CRPREF:
+ return isUseUserCRPref();
+
}
throw new IllegalStateException();
}
@@ -1381,6 +1425,8 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return isSetExperimentDataDir();
case USER_NAME:
return isSetUserName();
+ case USE_USER_CRPREF:
+ return isSetUseUserCRPref();
}
throw new IllegalStateException();
}
@@ -1605,6 +1651,15 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return false;
}
+ boolean this_present_useUserCRPref = true && this.isSetUseUserCRPref();
+ boolean that_present_useUserCRPref = true && that.isSetUseUserCRPref();
+ if (this_present_useUserCRPref || that_present_useUserCRPref) {
+ if (!(this_present_useUserCRPref && that_present_useUserCRPref))
+ return false;
+ if (this.useUserCRPref != that.useUserCRPref)
+ return false;
+ }
+
return true;
}
@@ -1727,6 +1782,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (present_userName)
list.add(userName);
+ boolean present_useUserCRPref = true && (isSetUseUserCRPref());
+ list.add(present_useUserCRPref);
+ if (present_useUserCRPref)
+ list.add(useUserCRPref);
+
return list.hashCode();
}
@@ -1968,6 +2028,16 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetUseUserCRPref()).compareTo(other.isSetUseUserCRPref());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUseUserCRPref()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.useUserCRPref, other.useUserCRPref);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -2197,6 +2267,12 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
}
first = false;
}
+ if (isSetUseUserCRPref()) {
+ if (!first) sb.append(", ");
+ sb.append("useUserCRPref:");
+ sb.append(this.useUserCRPref);
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -2503,6 +2579,14 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 24: // USE_USER_CRPREF
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.useUserCRPref = iprot.readBool();
+ struct.setUseUserCRPrefIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2707,6 +2791,11 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
oprot.writeFieldEnd();
}
}
+ if (struct.isSetUseUserCRPref()) {
+ oprot.writeFieldBegin(USE_USER_CRPREF_FIELD_DESC);
+ oprot.writeBool(struct.useUserCRPref);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -2790,7 +2879,10 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetUserName()) {
optionals.set(20);
}
- oprot.writeBitSet(optionals, 21);
+ if (struct.isSetUseUserCRPref()) {
+ optionals.set(21);
+ }
+ oprot.writeBitSet(optionals, 22);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -2890,6 +2982,9 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
if (struct.isSetUserName()) {
oprot.writeString(struct.userName);
}
+ if (struct.isSetUseUserCRPref()) {
+ oprot.writeBool(struct.useUserCRPref);
+ }
}
@Override
@@ -2899,7 +2994,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(22);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -3044,6 +3139,10 @@ public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, Proce
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
}
+ if (incoming.get(21)) {
+ struct.useUserCRPref = iprot.readBool();
+ struct.setUseUserCRPrefIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee4022f/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 ac78837..b2bce73 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
@@ -62,5 +62,6 @@ struct ProcessModel {
20: optional string userDn,
21: optional bool generateCert = 0,
22: optional string experimentDataDir,
- 23: optional string userName;
+ 23: optional string userName,
+ 24: optional bool useUserCRPref;
}
\ No newline at end of file