Moving usage reporting gateway id into resource preference
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/48e2593e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/48e2593e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/48e2593e Branch: refs/heads/master Commit: 48e2593ec724cea9861ce27ff47c3aced2a56349 Parents: e303bb5 Author: smarru <[email protected]> Authored: Wed Feb 24 12:02:15 2016 -0500 Committer: smarru <[email protected]> Committed: Wed Feb 24 12:02:16 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../gateway_resource_profile_model_types.cpp | 44 +++---- .../gateway_resource_profile_model_types.h | 24 ++-- .../Model/AppCatalog/GatewayProfile/Types.php | 46 ++++---- .../model/appcatalog/gatewayprofile/ttypes.py | 30 ++--- .../apache/airavata/model/ComponentStatus.java | 2 +- .../org/apache/airavata/model/EdgeModel.java | 2 +- .../org/apache/airavata/model/NodeModel.java | 2 +- .../org/apache/airavata/model/PortModel.java | 2 +- .../apache/airavata/model/WorkflowModel.java | 2 +- .../apache/airavata/model/WorkflowStatus.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 116 ++++++++++++++++++- .../gatewayprofile/GatewayResourceProfile.java | 116 +------------------ .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 2 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../data/resource/DataReplicaLocationModel.java | 2 +- .../model/data/resource/DataResourceModel.java | 2 +- .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../catalog/impl/GwyResourceProfileImpl.java | 6 +- .../model/ComputeResourcePreference.java | 10 ++ .../core/app/catalog/model/GatewayProfile.java | 11 -- .../ComputeHostPreferenceResource.java | 11 ++ .../resources/GatewayProfileResource.java | 11 -- .../app/catalog/util/AppCatalogJPAUtils.java | 2 +- .../util/AppCatalogThriftConversion.java | 2 +- .../src/main/resources/appcatalog-derby.sql | 2 +- .../src/main/resources/appcatalog-mysql.sql | 2 +- .../gateway_resource_profile_model.thrift | 6 +- 97 files changed, 300 insertions(+), 301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java index 828c8b4..9f1ebc4 100644 --- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java +++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class Airavata { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 70d5ff6..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 @@ -78,6 +78,11 @@ void ComputeResourcePreference::__set_resourceSpecificCredentialStoreToken(const __isset.resourceSpecificCredentialStoreToken = true; } +void ComputeResourcePreference::__set_usageReportingGatewayId(const std::string& val) { + this->usageReportingGatewayId = val; +__isset.usageReportingGatewayId = true; +} + uint32_t ComputeResourcePreference::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -177,6 +182,14 @@ uint32_t ComputeResourcePreference::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; + case 10: + 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; @@ -241,6 +254,11 @@ uint32_t ComputeResourcePreference::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->resourceSpecificCredentialStoreToken); xfer += oprot->writeFieldEnd(); } + if (this->__isset.usageReportingGatewayId) { + xfer += oprot->writeFieldBegin("usageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 10); + xfer += oprot->writeString(this->usageReportingGatewayId); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -257,6 +275,7 @@ void swap(ComputeResourcePreference &a, ComputeResourcePreference &b) { swap(a.scratchLocation, b.scratchLocation); swap(a.allocationProjectNumber, b.allocationProjectNumber); swap(a.resourceSpecificCredentialStoreToken, b.resourceSpecificCredentialStoreToken); + swap(a.usageReportingGatewayId, b.usageReportingGatewayId); swap(a.__isset, b.__isset); } @@ -270,6 +289,7 @@ ComputeResourcePreference::ComputeResourcePreference(const ComputeResourcePrefer scratchLocation = other2.scratchLocation; allocationProjectNumber = other2.allocationProjectNumber; resourceSpecificCredentialStoreToken = other2.resourceSpecificCredentialStoreToken; + usageReportingGatewayId = other2.usageReportingGatewayId; __isset = other2.__isset; } ComputeResourcePreference& ComputeResourcePreference::operator=(const ComputeResourcePreference& other3) { @@ -282,6 +302,7 @@ ComputeResourcePreference& ComputeResourcePreference::operator=(const ComputeRes scratchLocation = other3.scratchLocation; allocationProjectNumber = other3.allocationProjectNumber; resourceSpecificCredentialStoreToken = other3.resourceSpecificCredentialStoreToken; + usageReportingGatewayId = other3.usageReportingGatewayId; __isset = other3.__isset; return *this; } @@ -297,6 +318,7 @@ void ComputeResourcePreference::printTo(std::ostream& out) const { out << ", " << "scratchLocation="; (__isset.scratchLocation ? (out << to_string(scratchLocation)) : (out << "<null>")); out << ", " << "allocationProjectNumber="; (__isset.allocationProjectNumber ? (out << to_string(allocationProjectNumber)) : (out << "<null>")); out << ", " << "resourceSpecificCredentialStoreToken="; (__isset.resourceSpecificCredentialStoreToken ? (out << to_string(resourceSpecificCredentialStoreToken)) : (out << "<null>")); + out << ", " << "usageReportingGatewayId="; (__isset.usageReportingGatewayId ? (out << to_string(usageReportingGatewayId)) : (out << "<null>")); out << ")"; } @@ -479,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); @@ -562,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; @@ -624,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; @@ -640,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); } @@ -649,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) { @@ -657,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; } @@ -668,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/48e2593e/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 d24a778..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 @@ -45,7 +45,7 @@ class StoragePreference; class GatewayResourceProfile; typedef struct _ComputeResourcePreference__isset { - _ComputeResourcePreference__isset() : loginUserName(false), preferredJobSubmissionProtocol(false), preferredDataMovementProtocol(false), preferredBatchQueue(false), scratchLocation(false), allocationProjectNumber(false), resourceSpecificCredentialStoreToken(false) {} + _ComputeResourcePreference__isset() : loginUserName(false), preferredJobSubmissionProtocol(false), preferredDataMovementProtocol(false), preferredBatchQueue(false), scratchLocation(false), allocationProjectNumber(false), resourceSpecificCredentialStoreToken(false), usageReportingGatewayId(false) {} bool loginUserName :1; bool preferredJobSubmissionProtocol :1; bool preferredDataMovementProtocol :1; @@ -53,6 +53,7 @@ typedef struct _ComputeResourcePreference__isset { bool scratchLocation :1; bool allocationProjectNumber :1; bool resourceSpecificCredentialStoreToken :1; + bool usageReportingGatewayId :1; } _ComputeResourcePreference__isset; class ComputeResourcePreference { @@ -60,7 +61,7 @@ class ComputeResourcePreference { ComputeResourcePreference(const ComputeResourcePreference&); ComputeResourcePreference& operator=(const ComputeResourcePreference&); - ComputeResourcePreference() : computeResourceId(), overridebyAiravata(true), loginUserName(), preferredJobSubmissionProtocol(( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)0), preferredDataMovementProtocol(( ::apache::airavata::model::data::movement::DataMovementProtocol::type)0), preferredBatchQueue(), scratchLocation(), allocationProjectNumber(), resourceSpecificCredentialStoreToken() { + ComputeResourcePreference() : computeResourceId(), overridebyAiravata(true), loginUserName(), preferredJobSubmissionProtocol(( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)0), preferredDataMovementProtocol(( ::apache::airavata::model::data::movement::DataMovementProtocol::type)0), preferredBatchQueue(), scratchLocation(), allocationProjectNumber(), resourceSpecificCredentialStoreToken(), usageReportingGatewayId() { } virtual ~ComputeResourcePreference() throw(); @@ -73,6 +74,7 @@ class ComputeResourcePreference { std::string scratchLocation; std::string allocationProjectNumber; std::string resourceSpecificCredentialStoreToken; + std::string usageReportingGatewayId; _ComputeResourcePreference__isset __isset; @@ -94,6 +96,8 @@ class ComputeResourcePreference { void __set_resourceSpecificCredentialStoreToken(const std::string& val); + void __set_usageReportingGatewayId(const std::string& val); + bool operator == (const ComputeResourcePreference & rhs) const { if (!(computeResourceId == rhs.computeResourceId)) @@ -128,6 +132,10 @@ class ComputeResourcePreference { return false; else if (__isset.resourceSpecificCredentialStoreToken && !(resourceSpecificCredentialStoreToken == rhs.resourceSpecificCredentialStoreToken)) return false; + if (__isset.usageReportingGatewayId != rhs.__isset.usageReportingGatewayId) + return false; + else if (__isset.usageReportingGatewayId && !(usageReportingGatewayId == rhs.usageReportingGatewayId)) + return false; return true; } bool operator != (const ComputeResourcePreference &rhs) const { @@ -220,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 { @@ -232,7 +239,7 @@ class GatewayResourceProfile { GatewayResourceProfile(const GatewayResourceProfile&); GatewayResourceProfile& operator=(const GatewayResourceProfile&); - GatewayResourceProfile() : gatewayID(), credentialStoreToken(), usageReportingGatewayId() { + GatewayResourceProfile() : gatewayID(), credentialStoreToken() { } virtual ~GatewayResourceProfile() throw(); @@ -240,7 +247,6 @@ class GatewayResourceProfile { std::string credentialStoreToken; std::vector<ComputeResourcePreference> computeResourcePreferences; std::vector<StoragePreference> storagePreferences; - std::string usageReportingGatewayId; _GatewayResourceProfile__isset __isset; @@ -252,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)) @@ -270,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/48e2593e/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 37e7837..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 @@ -90,6 +90,10 @@ class ComputeResourcePreference { * @var string */ public $resourceSpecificCredentialStoreToken = null; + /** + * @var string + */ + public $usageReportingGatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -130,6 +134,10 @@ class ComputeResourcePreference { 'var' => 'resourceSpecificCredentialStoreToken', 'type' => TType::STRING, ), + 10 => array( + 'var' => 'usageReportingGatewayId', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -160,6 +168,9 @@ class ComputeResourcePreference { if (isset($vals['resourceSpecificCredentialStoreToken'])) { $this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken']; } + if (isset($vals['usageReportingGatewayId'])) { + $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; + } } } @@ -245,6 +256,13 @@ class ComputeResourcePreference { $xfer += $input->skip($ftype); } break; + case 10: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->usageReportingGatewayId); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -303,6 +321,11 @@ class ComputeResourcePreference { $xfer += $output->writeString($this->resourceSpecificCredentialStoreToken); $xfer += $output->writeFieldEnd(); } + if ($this->usageReportingGatewayId !== null) { + $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 10); + $xfer += $output->writeString($this->usageReportingGatewayId); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -486,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)) { @@ -520,10 +539,6 @@ class GatewayResourceProfile { 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), - 5 => array( - 'var' => 'usageReportingGatewayId', - 'type' => TType::STRING, - ), ); } if (is_array($vals)) { @@ -539,9 +554,6 @@ class GatewayResourceProfile { if (isset($vals['storagePreferences'])) { $this->storagePreferences = $vals['storagePreferences']; } - if (isset($vals['usageReportingGatewayId'])) { - $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; - } } } @@ -614,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; @@ -678,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/48e2593e/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 ddd0723..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 @@ -65,6 +65,7 @@ class ComputeResourcePreference: - scratchLocation - allocationProjectNumber - resourceSpecificCredentialStoreToken + - usageReportingGatewayId """ thrift_spec = ( @@ -78,9 +79,10 @@ class ComputeResourcePreference: (7, TType.STRING, 'scratchLocation', None, None, ), # 7 (8, TType.STRING, 'allocationProjectNumber', None, None, ), # 8 (9, TType.STRING, 'resourceSpecificCredentialStoreToken', None, None, ), # 9 + (10, TType.STRING, 'usageReportingGatewayId', None, None, ), # 10 ) - def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None,): + def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None,): self.computeResourceId = computeResourceId self.overridebyAiravata = overridebyAiravata self.loginUserName = loginUserName @@ -90,6 +92,7 @@ class ComputeResourcePreference: self.scratchLocation = scratchLocation self.allocationProjectNumber = allocationProjectNumber self.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken + 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: @@ -145,6 +148,11 @@ class ComputeResourcePreference: self.resourceSpecificCredentialStoreToken = iprot.readString() else: iprot.skip(ftype) + elif fid == 10: + if ftype == TType.STRING: + self.usageReportingGatewayId = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -191,6 +199,10 @@ class ComputeResourcePreference: oprot.writeFieldBegin('resourceSpecificCredentialStoreToken', TType.STRING, 9) oprot.writeString(self.resourceSpecificCredentialStoreToken) oprot.writeFieldEnd() + if self.usageReportingGatewayId is not None: + oprot.writeFieldBegin('usageReportingGatewayId', TType.STRING, 10) + oprot.writeString(self.usageReportingGatewayId) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -213,6 +225,7 @@ class ComputeResourcePreference: value = (value * 31) ^ hash(self.scratchLocation) value = (value * 31) ^ hash(self.allocationProjectNumber) value = (value * 31) ^ hash(self.resourceSpecificCredentialStoreToken) + value = (value * 31) ^ hash(self.usageReportingGatewayId) return value def __repr__(self): @@ -351,7 +364,6 @@ class GatewayResourceProfile: - credentialStoreToken - computeResourcePreferences - storagePreferences - - usageReportingGatewayId """ thrift_spec = ( @@ -360,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: @@ -411,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() @@ -448,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() @@ -467,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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java index 9ce3882..f3d6395 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java index fbdba25..681e161 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java index d1d2efc..30a7001 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java index 778f245..586b3f9 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java index 053bbd4..180ed8a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java index 9ba3d45..4cbb384 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index 8176d8c..8ad556e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index bf8e8b3..22e4a62 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java index f04f144..27185f4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * commandOrder: * Order of the command in the multiple command situation */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java index 91d5fd8..90abf0b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java @@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory; * envPathOrder: * The order of the setting of the env variables when there are multiple env variables */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java index e567ff0..a968715 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * Outputs generated from the application * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java index 7559a07..43e2084 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * maxRunTime: * Maximum allowed run time in hours. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java index 6148630..ffb8e4b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java index 5c4511c..91fc6ef 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; * Map of file systems type and the path. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java index 024f506..5d1f786 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java index a277ca3..9ee2d14 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index 357f791..a320fd6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index d695b54..4b4c67c 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * An enumeration of commonly used manager commands. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java index cc74357..9cf626e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * the same. Example: *@*.example.com or *@example.com * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java index 4a057e9..81574f5 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; * authenticationMode * The authenticationMode defines the way certificate is fetched. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java index ef67949..3d9d990 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java @@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory; * default credential store. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference"); @@ -98,6 +98,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput private static final org.apache.thrift.protocol.TField SCRATCH_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("scratchLocation", org.apache.thrift.protocol.TType.STRING, (short)7); private static final org.apache.thrift.protocol.TField ALLOCATION_PROJECT_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("allocationProjectNumber", org.apache.thrift.protocol.TType.STRING, (short)8); private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("usageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)10); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -114,6 +115,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput private String scratchLocation; // optional private String allocationProjectNumber; // optional private String resourceSpecificCredentialStoreToken; // optional + private String usageReportingGatewayId; // 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 { @@ -133,7 +135,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput PREFERRED_BATCH_QUEUE((short)6, "preferredBatchQueue"), SCRATCH_LOCATION((short)7, "scratchLocation"), ALLOCATION_PROJECT_NUMBER((short)8, "allocationProjectNumber"), - RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)9, "resourceSpecificCredentialStoreToken"); + RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)9, "resourceSpecificCredentialStoreToken"), + USAGE_REPORTING_GATEWAY_ID((short)10, "usageReportingGatewayId"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -166,6 +169,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return ALLOCATION_PROJECT_NUMBER; case 9: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN return RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN; + case 10: // USAGE_REPORTING_GATEWAY_ID + return USAGE_REPORTING_GATEWAY_ID; default: return null; } @@ -208,7 +213,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput // isset id assignments private static final int __OVERRIDEBYAIRAVATA_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN}; + private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.USAGE_REPORTING_GATEWAY_ID}; 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); @@ -230,6 +235,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("usageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourcePreference.class, metaDataMap); } @@ -279,6 +286,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (other.isSetResourceSpecificCredentialStoreToken()) { this.resourceSpecificCredentialStoreToken = other.resourceSpecificCredentialStoreToken; } + if (other.isSetUsageReportingGatewayId()) { + this.usageReportingGatewayId = other.usageReportingGatewayId; + } } public ComputeResourcePreference deepCopy() { @@ -297,6 +307,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput this.scratchLocation = null; this.allocationProjectNumber = null; this.resourceSpecificCredentialStoreToken = null; + this.usageReportingGatewayId = null; } public String getComputeResourceId() { @@ -521,6 +532,29 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput } } + public String getUsageReportingGatewayId() { + return this.usageReportingGatewayId; + } + + public void setUsageReportingGatewayId(String usageReportingGatewayId) { + this.usageReportingGatewayId = usageReportingGatewayId; + } + + public void unsetUsageReportingGatewayId() { + this.usageReportingGatewayId = null; + } + + /** Returns true if field usageReportingGatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetUsageReportingGatewayId() { + return this.usageReportingGatewayId != null; + } + + public void setUsageReportingGatewayIdIsSet(boolean value) { + if (!value) { + this.usageReportingGatewayId = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case COMPUTE_RESOURCE_ID: @@ -595,6 +629,14 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput } break; + case USAGE_REPORTING_GATEWAY_ID: + if (value == null) { + unsetUsageReportingGatewayId(); + } else { + setUsageReportingGatewayId((String)value); + } + break; + } } @@ -627,6 +669,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN: return getResourceSpecificCredentialStoreToken(); + case USAGE_REPORTING_GATEWAY_ID: + return getUsageReportingGatewayId(); + } throw new IllegalStateException(); } @@ -656,6 +701,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return isSetAllocationProjectNumber(); case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN: return isSetResourceSpecificCredentialStoreToken(); + case USAGE_REPORTING_GATEWAY_ID: + return isSetUsageReportingGatewayId(); } throw new IllegalStateException(); } @@ -754,6 +801,15 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return false; } + boolean this_present_usageReportingGatewayId = true && this.isSetUsageReportingGatewayId(); + boolean that_present_usageReportingGatewayId = true && that.isSetUsageReportingGatewayId(); + if (this_present_usageReportingGatewayId || that_present_usageReportingGatewayId) { + if (!(this_present_usageReportingGatewayId && that_present_usageReportingGatewayId)) + return false; + if (!this.usageReportingGatewayId.equals(that.usageReportingGatewayId)) + return false; + } + return true; } @@ -806,6 +862,11 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (present_resourceSpecificCredentialStoreToken) list.add(resourceSpecificCredentialStoreToken); + boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId()); + list.add(present_usageReportingGatewayId); + if (present_usageReportingGatewayId) + list.add(usageReportingGatewayId); + return list.hashCode(); } @@ -907,6 +968,16 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return lastComparison; } } + lastComparison = Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUsageReportingGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usageReportingGatewayId, other.usageReportingGatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1008,6 +1079,16 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput } first = false; } + if (isSetUsageReportingGatewayId()) { + if (!first) sb.append(", "); + sb.append("usageReportingGatewayId:"); + if (this.usageReportingGatewayId == null) { + sb.append("null"); + } else { + sb.append(this.usageReportingGatewayId); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1133,6 +1214,14 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 10: // USAGE_REPORTING_GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.usageReportingGatewayId = iprot.readString(); + struct.setUsageReportingGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1203,6 +1292,13 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput oprot.writeFieldEnd(); } } + if (struct.usageReportingGatewayId != null) { + if (struct.isSetUsageReportingGatewayId()) { + oprot.writeFieldBegin(USAGE_REPORTING_GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.usageReportingGatewayId); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1244,7 +1340,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (struct.isSetResourceSpecificCredentialStoreToken()) { optionals.set(6); } - oprot.writeBitSet(optionals, 7); + if (struct.isSetUsageReportingGatewayId()) { + optionals.set(7); + } + oprot.writeBitSet(optionals, 8); if (struct.isSetLoginUserName()) { oprot.writeString(struct.loginUserName); } @@ -1266,6 +1365,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (struct.isSetResourceSpecificCredentialStoreToken()) { oprot.writeString(struct.resourceSpecificCredentialStoreToken); } + if (struct.isSetUsageReportingGatewayId()) { + oprot.writeString(struct.usageReportingGatewayId); + } } @Override @@ -1275,7 +1377,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput struct.setComputeResourceIdIsSet(true); struct.overridebyAiravata = iprot.readBool(); struct.setOverridebyAiravataIsSet(true); - BitSet incoming = iprot.readBitSet(7); + BitSet incoming = iprot.readBitSet(8); if (incoming.get(0)) { struct.loginUserName = iprot.readString(); struct.setLoginUserNameIsSet(true); @@ -1304,6 +1406,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput struct.resourceSpecificCredentialStoreToken = iprot.readString(); struct.setResourceSpecificCredentialStoreTokenIsSet(true); } + if (incoming.get(7)) { + struct.usageReportingGatewayId = iprot.readString(); + struct.setUsageReportingGatewayIdIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java index ea29157..faefdf4 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * List of resource preferences for each of the registered compute resources. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile"); @@ -72,7 +72,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe private static final org.apache.thrift.protocol.TField CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("credentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourcePreferences", org.apache.thrift.protocol.TType.LIST, (short)3); private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreferences", org.apache.thrift.protocol.TType.LIST, (short)4); - private static final org.apache.thrift.protocol.TField USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("usageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -84,15 +83,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe private String credentialStoreToken; // optional private List<ComputeResourcePreference> computeResourcePreferences; // optional private List<StoragePreference> storagePreferences; // optional - private String usageReportingGatewayId; // 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 { GATEWAY_ID((short)1, "gatewayID"), CREDENTIAL_STORE_TOKEN((short)2, "credentialStoreToken"), COMPUTE_RESOURCE_PREFERENCES((short)3, "computeResourcePreferences"), - STORAGE_PREFERENCES((short)4, "storagePreferences"), - USAGE_REPORTING_GATEWAY_ID((short)5, "usageReportingGatewayId"); + STORAGE_PREFERENCES((short)4, "storagePreferences"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -115,8 +112,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe return COMPUTE_RESOURCE_PREFERENCES; case 4: // STORAGE_PREFERENCES return STORAGE_PREFERENCES; - case 5: // USAGE_REPORTING_GATEWAY_ID - return USAGE_REPORTING_GATEWAY_ID; default: return null; } @@ -157,7 +152,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } // isset id assignments - private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.USAGE_REPORTING_GATEWAY_ID}; + private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES}; 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); @@ -171,8 +166,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe tmpMap.put(_Fields.STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("storagePreferences", 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, StoragePreference.class)))); - tmpMap.put(_Fields.USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("usageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayResourceProfile.class, metaDataMap); } @@ -211,9 +204,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } this.storagePreferences = __this__storagePreferences; } - if (other.isSetUsageReportingGatewayId()) { - this.usageReportingGatewayId = other.usageReportingGatewayId; - } } public GatewayResourceProfile deepCopy() { @@ -226,7 +216,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe this.credentialStoreToken = null; this.computeResourcePreferences = null; this.storagePreferences = null; - this.usageReportingGatewayId = null; } public String getGatewayID() { @@ -351,29 +340,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } } - public String getUsageReportingGatewayId() { - return this.usageReportingGatewayId; - } - - public void setUsageReportingGatewayId(String usageReportingGatewayId) { - this.usageReportingGatewayId = usageReportingGatewayId; - } - - public void unsetUsageReportingGatewayId() { - this.usageReportingGatewayId = null; - } - - /** Returns true if field usageReportingGatewayId is set (has been assigned a value) and false otherwise */ - public boolean isSetUsageReportingGatewayId() { - return this.usageReportingGatewayId != null; - } - - public void setUsageReportingGatewayIdIsSet(boolean value) { - if (!value) { - this.usageReportingGatewayId = null; - } - } - public void setFieldValue(_Fields field, Object value) { switch (field) { case GATEWAY_ID: @@ -408,14 +374,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } break; - case USAGE_REPORTING_GATEWAY_ID: - if (value == null) { - unsetUsageReportingGatewayId(); - } else { - setUsageReportingGatewayId((String)value); - } - break; - } } @@ -433,9 +391,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe case STORAGE_PREFERENCES: return getStoragePreferences(); - case USAGE_REPORTING_GATEWAY_ID: - return getUsageReportingGatewayId(); - } throw new IllegalStateException(); } @@ -455,8 +410,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe return isSetComputeResourcePreferences(); case STORAGE_PREFERENCES: return isSetStoragePreferences(); - case USAGE_REPORTING_GATEWAY_ID: - return isSetUsageReportingGatewayId(); } throw new IllegalStateException(); } @@ -510,15 +463,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe return false; } - boolean this_present_usageReportingGatewayId = true && this.isSetUsageReportingGatewayId(); - boolean that_present_usageReportingGatewayId = true && that.isSetUsageReportingGatewayId(); - if (this_present_usageReportingGatewayId || that_present_usageReportingGatewayId) { - if (!(this_present_usageReportingGatewayId && that_present_usageReportingGatewayId)) - return false; - if (!this.usageReportingGatewayId.equals(that.usageReportingGatewayId)) - return false; - } - return true; } @@ -546,11 +490,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe if (present_storagePreferences) list.add(storagePreferences); - boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId()); - list.add(present_usageReportingGatewayId); - if (present_usageReportingGatewayId) - list.add(usageReportingGatewayId); - return list.hashCode(); } @@ -602,16 +541,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe return lastComparison; } } - lastComparison = Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUsageReportingGatewayId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usageReportingGatewayId, other.usageReportingGatewayId); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -669,16 +598,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } first = false; } - if (isSetUsageReportingGatewayId()) { - if (!first) sb.append(", "); - sb.append("usageReportingGatewayId:"); - if (this.usageReportingGatewayId == null) { - sb.append("null"); - } else { - sb.append(this.usageReportingGatewayId); - } - first = false; - } sb.append(")"); return sb.toString(); } @@ -780,14 +699,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // USAGE_REPORTING_GATEWAY_ID - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.usageReportingGatewayId = iprot.readString(); - struct.setUsageReportingGatewayIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -841,13 +752,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe oprot.writeFieldEnd(); } } - if (struct.usageReportingGatewayId != null) { - if (struct.isSetUsageReportingGatewayId()) { - oprot.writeFieldBegin(USAGE_REPORTING_GATEWAY_ID_FIELD_DESC); - oprot.writeString(struct.usageReportingGatewayId); - oprot.writeFieldEnd(); - } - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -876,10 +780,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe if (struct.isSetStoragePreferences()) { optionals.set(2); } - if (struct.isSetUsageReportingGatewayId()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetCredentialStoreToken()) { oprot.writeString(struct.credentialStoreToken); } @@ -901,9 +802,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } } } - if (struct.isSetUsageReportingGatewayId()) { - oprot.writeString(struct.usageReportingGatewayId); - } } @Override @@ -911,7 +809,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe TTupleProtocol iprot = (TTupleProtocol) prot; struct.gatewayID = iprot.readString(); struct.setGatewayIDIsSet(true); - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.credentialStoreToken = iprot.readString(); struct.setCredentialStoreTokenIsSet(true); @@ -944,10 +842,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } struct.setStoragePreferencesIsSet(true); } - if (incoming.get(3)) { - struct.usageReportingGatewayId = iprot.readString(); - struct.setUsageReportingGatewayIdIsSet(true); - } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java index 255ba6d..6cd68e6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
