You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/04 22:46:02 UTC
[2/2] airavata git commit: adding data storage host id to gateway
profile
adding data storage host id to gateway profile
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8ce513c2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8ce513c2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8ce513c2
Branch: refs/heads/master
Commit: 8ce513c28610d2c60dfc01dc45233330b94f8acf
Parents: 5eb3c26
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Nov 4 16:45:50 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Nov 4 16:45:50 2015 -0500
----------------------------------------------------------------------
.../api/server/util/AppCatalogInitUtil.java | 1 +
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../src/main/resources/lib/airavata/Airavata.h | 32 ++---
.../gateway_resource_profile_model_types.cpp | 37 +++++-
.../gateway_resource_profile_model_types.h | 11 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 37 +++++-
.../model/appcatalog/gatewayprofile/ttypes.py | 33 +++--
.../client/samples/CreateLaunchExperiment.java | 4 +-
.../org/apache/airavata/model/Workflow.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/DataMovementInterface.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/GridFTPDataMovement.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALDataMovement.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SCPDataMovement.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreDataMovement.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/DataStoragePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 129 +++++++++++++++++--
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 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 | 2 +
.../core/app/catalog/model/GatewayProfile.java | 11 ++
.../resources/GatewayProfileResource.java | 11 ++
.../app/catalog/util/AppCatalogJPAUtils.java | 1 +
.../util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../gateway_resource_profile_model.thrift | 7 +-
90 files changed, 332 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java
index c6dcd22..b513f1d 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/AppCatalogInitUtil.java
@@ -82,6 +82,7 @@ public class AppCatalogInitUtil {
if (!gatewayProfileResource.isExists(ServerSettings.getDefaultUserGateway())){
gatewayProfileResource.setGatewayID(ServerSettings.getDefaultUserGateway());
gatewayProfileResource.setCreatedTime(AiravataUtils.getCurrentTimestamp());
+ gatewayProfileResource.setDataStorageHost("localhost");
gatewayProfileResource.save();
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 ea522fc..29213e0 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 468f3a5..246f4d1 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -18230,8 +18230,8 @@ class Airavata_deleteBatchQueue_presult {
class Airavata_registerGatewayResourceProfile_args {
public:
- static const char* ascii_fingerprint; // = "1FB1A3296BE8D5645CC8A3903C0A6C79";
- static const uint8_t binary_fingerprint[16]; // = {0x1F,0xB1,0xA3,0x29,0x6B,0xE8,0xD5,0x64,0x5C,0xC8,0xA3,0x90,0x3C,0x0A,0x6C,0x79};
+ static const char* ascii_fingerprint; // = "667FD33BAB329A430AE44DAC52FE58DD";
+ static const uint8_t binary_fingerprint[16]; // = {0x66,0x7F,0xD3,0x3B,0xAB,0x32,0x9A,0x43,0x0A,0xE4,0x4D,0xAC,0x52,0xFE,0x58,0xDD};
Airavata_registerGatewayResourceProfile_args(const Airavata_registerGatewayResourceProfile_args&);
Airavata_registerGatewayResourceProfile_args& operator=(const Airavata_registerGatewayResourceProfile_args&);
@@ -18270,8 +18270,8 @@ class Airavata_registerGatewayResourceProfile_args {
class Airavata_registerGatewayResourceProfile_pargs {
public:
- static const char* ascii_fingerprint; // = "1FB1A3296BE8D5645CC8A3903C0A6C79";
- static const uint8_t binary_fingerprint[16]; // = {0x1F,0xB1,0xA3,0x29,0x6B,0xE8,0xD5,0x64,0x5C,0xC8,0xA3,0x90,0x3C,0x0A,0x6C,0x79};
+ static const char* ascii_fingerprint; // = "667FD33BAB329A430AE44DAC52FE58DD";
+ static const uint8_t binary_fingerprint[16]; // = {0x66,0x7F,0xD3,0x3B,0xAB,0x32,0x9A,0x43,0x0A,0xE4,0x4D,0xAC,0x52,0xFE,0x58,0xDD};
virtual ~Airavata_registerGatewayResourceProfile_pargs() throw();
@@ -18447,8 +18447,8 @@ typedef struct _Airavata_getGatewayResourceProfile_result__isset {
class Airavata_getGatewayResourceProfile_result {
public:
- static const char* ascii_fingerprint; // = "0B5B802A477CC941D8C04C7A4E80FEBB";
- static const uint8_t binary_fingerprint[16]; // = {0x0B,0x5B,0x80,0x2A,0x47,0x7C,0xC9,0x41,0xD8,0xC0,0x4C,0x7A,0x4E,0x80,0xFE,0xBB};
+ static const char* ascii_fingerprint; // = "C56B4114D8C2C1D8821722E4954571BD";
+ static const uint8_t binary_fingerprint[16]; // = {0xC5,0x6B,0x41,0x14,0xD8,0xC2,0xC1,0xD8,0x82,0x17,0x22,0xE4,0x95,0x45,0x71,0xBD};
Airavata_getGatewayResourceProfile_result(const Airavata_getGatewayResourceProfile_result&);
Airavata_getGatewayResourceProfile_result& operator=(const Airavata_getGatewayResourceProfile_result&);
@@ -18512,8 +18512,8 @@ typedef struct _Airavata_getGatewayResourceProfile_presult__isset {
class Airavata_getGatewayResourceProfile_presult {
public:
- static const char* ascii_fingerprint; // = "0B5B802A477CC941D8C04C7A4E80FEBB";
- static const uint8_t binary_fingerprint[16]; // = {0x0B,0x5B,0x80,0x2A,0x47,0x7C,0xC9,0x41,0xD8,0xC0,0x4C,0x7A,0x4E,0x80,0xFE,0xBB};
+ static const char* ascii_fingerprint; // = "C56B4114D8C2C1D8821722E4954571BD";
+ static const uint8_t binary_fingerprint[16]; // = {0xC5,0x6B,0x41,0x14,0xD8,0xC2,0xC1,0xD8,0x82,0x17,0x22,0xE4,0x95,0x45,0x71,0xBD};
virtual ~Airavata_getGatewayResourceProfile_presult() throw();
@@ -18534,8 +18534,8 @@ class Airavata_getGatewayResourceProfile_presult {
class Airavata_updateGatewayResourceProfile_args {
public:
- static const char* ascii_fingerprint; // = "4A59189B36D11C49633BA2F74222F93A";
- static const uint8_t binary_fingerprint[16]; // = {0x4A,0x59,0x18,0x9B,0x36,0xD1,0x1C,0x49,0x63,0x3B,0xA2,0xF7,0x42,0x22,0xF9,0x3A};
+ static const char* ascii_fingerprint; // = "B7831486081963A43B793189F5448F3C";
+ static const uint8_t binary_fingerprint[16]; // = {0xB7,0x83,0x14,0x86,0x08,0x19,0x63,0xA4,0x3B,0x79,0x31,0x89,0xF5,0x44,0x8F,0x3C};
Airavata_updateGatewayResourceProfile_args(const Airavata_updateGatewayResourceProfile_args&);
Airavata_updateGatewayResourceProfile_args& operator=(const Airavata_updateGatewayResourceProfile_args&);
@@ -18579,8 +18579,8 @@ class Airavata_updateGatewayResourceProfile_args {
class Airavata_updateGatewayResourceProfile_pargs {
public:
- static const char* ascii_fingerprint; // = "4A59189B36D11C49633BA2F74222F93A";
- static const uint8_t binary_fingerprint[16]; // = {0x4A,0x59,0x18,0x9B,0x36,0xD1,0x1C,0x49,0x63,0x3B,0xA2,0xF7,0x42,0x22,0xF9,0x3A};
+ static const char* ascii_fingerprint; // = "B7831486081963A43B793189F5448F3C";
+ static const uint8_t binary_fingerprint[16]; // = {0xB7,0x83,0x14,0x86,0x08,0x19,0x63,0xA4,0x3B,0x79,0x31,0x89,0xF5,0x44,0x8F,0x3C};
virtual ~Airavata_updateGatewayResourceProfile_pargs() throw();
@@ -19851,8 +19851,8 @@ typedef struct _Airavata_getAllGatewayResourceProfiles_result__isset {
class Airavata_getAllGatewayResourceProfiles_result {
public:
- static const char* ascii_fingerprint; // = "E4C23A3951BDEE94F5F54BB19B021761";
- static const uint8_t binary_fingerprint[16]; // = {0xE4,0xC2,0x3A,0x39,0x51,0xBD,0xEE,0x94,0xF5,0xF5,0x4B,0xB1,0x9B,0x02,0x17,0x61};
+ static const char* ascii_fingerprint; // = "BD4F6278E47EC9154E06BC927A88FE7E";
+ static const uint8_t binary_fingerprint[16]; // = {0xBD,0x4F,0x62,0x78,0xE4,0x7E,0xC9,0x15,0x4E,0x06,0xBC,0x92,0x7A,0x88,0xFE,0x7E};
Airavata_getAllGatewayResourceProfiles_result(const Airavata_getAllGatewayResourceProfiles_result&);
Airavata_getAllGatewayResourceProfiles_result& operator=(const Airavata_getAllGatewayResourceProfiles_result&);
@@ -19916,8 +19916,8 @@ typedef struct _Airavata_getAllGatewayResourceProfiles_presult__isset {
class Airavata_getAllGatewayResourceProfiles_presult {
public:
- static const char* ascii_fingerprint; // = "E4C23A3951BDEE94F5F54BB19B021761";
- static const uint8_t binary_fingerprint[16]; // = {0xE4,0xC2,0x3A,0x39,0x51,0xBD,0xEE,0x94,0xF5,0xF5,0x4B,0xB1,0x9B,0x02,0x17,0x61};
+ static const char* ascii_fingerprint; // = "BD4F6278E47EC9154E06BC927A88FE7E";
+ static const uint8_t binary_fingerprint[16]; // = {0xBD,0x4F,0x62,0x78,0xE4,0x7E,0xC9,0x15,0x4E,0x06,0xBC,0x92,0x7A,0x88,0xFE,0x7E};
virtual ~Airavata_getAllGatewayResourceProfiles_presult() throw();
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 6da0cfa..e0e4c94 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
@@ -472,6 +472,10 @@ void GatewayResourceProfile::__set_gatewayID(const std::string& val) {
this->gatewayID = val;
}
+void GatewayResourceProfile::__set_dataStorageHostName(const std::string& val) {
+ this->dataStorageHostName = val;
+}
+
void GatewayResourceProfile::__set_credentialStoreToken(const std::string& val) {
this->credentialStoreToken = val;
__isset.credentialStoreToken = true;
@@ -487,8 +491,8 @@ void GatewayResourceProfile::__set_dataStoragePreferences(const std::vector<Data
__isset.dataStoragePreferences = true;
}
-const char* GatewayResourceProfile::ascii_fingerprint = "A4BF6D60A7DE5979505C0E7F00278F12";
-const uint8_t GatewayResourceProfile::binary_fingerprint[16] = {0xA4,0xBF,0x6D,0x60,0xA7,0xDE,0x59,0x79,0x50,0x5C,0x0E,0x7F,0x00,0x27,0x8F,0x12};
+const char* GatewayResourceProfile::ascii_fingerprint = "37EFF83E3A15E60FB3772FDFEAD90A88";
+const uint8_t GatewayResourceProfile::binary_fingerprint[16] = {0x37,0xEF,0xF8,0x3E,0x3A,0x15,0xE6,0x0F,0xB3,0x77,0x2F,0xDF,0xEA,0xD9,0x0A,0x88};
uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -502,6 +506,7 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
using ::apache::thrift::protocol::TProtocolException;
bool isset_gatewayID = false;
+ bool isset_dataStorageHostName = false;
while (true)
{
@@ -521,13 +526,21 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->dataStorageHostName);
+ isset_dataStorageHostName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->credentialStoreToken);
this->__isset.credentialStoreToken = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->computeResourcePreferences.clear();
@@ -547,7 +560,7 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->dataStoragePreferences.clear();
@@ -578,6 +591,8 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
if (!isset_gatewayID)
throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_dataStorageHostName)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -590,13 +605,17 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
xfer += oprot->writeString(this->gatewayID);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("dataStorageHostName", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->dataStorageHostName);
+ xfer += oprot->writeFieldEnd();
+
if (this->__isset.credentialStoreToken) {
- xfer += oprot->writeFieldBegin("credentialStoreToken", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeFieldBegin("credentialStoreToken", ::apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->credentialStoreToken);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.computeResourcePreferences) {
- xfer += oprot->writeFieldBegin("computeResourcePreferences", ::apache::thrift::protocol::T_LIST, 3);
+ xfer += oprot->writeFieldBegin("computeResourcePreferences", ::apache::thrift::protocol::T_LIST, 4);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->computeResourcePreferences.size()));
std::vector<ComputeResourcePreference> ::const_iterator _iter16;
@@ -609,7 +628,7 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
xfer += oprot->writeFieldEnd();
}
if (this->__isset.dataStoragePreferences) {
- xfer += oprot->writeFieldBegin("dataStoragePreferences", ::apache::thrift::protocol::T_LIST, 4);
+ xfer += oprot->writeFieldBegin("dataStoragePreferences", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataStoragePreferences.size()));
std::vector<DataStoragePreference> ::const_iterator _iter17;
@@ -630,6 +649,7 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
using ::std::swap;
swap(a.gatewayID, b.gatewayID);
+ swap(a.dataStorageHostName, b.dataStorageHostName);
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
swap(a.dataStoragePreferences, b.dataStoragePreferences);
@@ -638,6 +658,7 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& other18) {
gatewayID = other18.gatewayID;
+ dataStorageHostName = other18.dataStorageHostName;
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
dataStoragePreferences = other18.dataStoragePreferences;
@@ -645,6 +666,7 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
gatewayID = other19.gatewayID;
+ dataStorageHostName = other19.dataStorageHostName;
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
dataStoragePreferences = other19.dataStoragePreferences;
@@ -655,6 +677,7 @@ std::ostream& operator<<(std::ostream& out, const GatewayResourceProfile& obj) {
using apache::thrift::to_string;
out << "GatewayResourceProfile(";
out << "gatewayID=" << to_string(obj.gatewayID);
+ out << ", " << "dataStorageHostName=" << to_string(obj.dataStorageHostName);
out << ", " << "credentialStoreToken="; (obj.__isset.credentialStoreToken ? (out << to_string(obj.credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (obj.__isset.computeResourcePreferences ? (out << to_string(obj.computeResourcePreferences)) : (out << "<null>"));
out << ", " << "dataStoragePreferences="; (obj.__isset.dataStoragePreferences ? (out << to_string(obj.dataStoragePreferences)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 59fbbef..7771f8f 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
@@ -222,16 +222,17 @@ typedef struct _GatewayResourceProfile__isset {
class GatewayResourceProfile {
public:
- static const char* ascii_fingerprint; // = "A4BF6D60A7DE5979505C0E7F00278F12";
- static const uint8_t binary_fingerprint[16]; // = {0xA4,0xBF,0x6D,0x60,0xA7,0xDE,0x59,0x79,0x50,0x5C,0x0E,0x7F,0x00,0x27,0x8F,0x12};
+ static const char* ascii_fingerprint; // = "37EFF83E3A15E60FB3772FDFEAD90A88";
+ static const uint8_t binary_fingerprint[16]; // = {0x37,0xEF,0xF8,0x3E,0x3A,0x15,0xE6,0x0F,0xB3,0x77,0x2F,0xDF,0xEA,0xD9,0x0A,0x88};
GatewayResourceProfile(const GatewayResourceProfile&);
GatewayResourceProfile& operator=(const GatewayResourceProfile&);
- GatewayResourceProfile() : gatewayID(), credentialStoreToken() {
+ GatewayResourceProfile() : gatewayID(), dataStorageHostName(), credentialStoreToken() {
}
virtual ~GatewayResourceProfile() throw();
std::string gatewayID;
+ std::string dataStorageHostName;
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
std::vector<DataStoragePreference> dataStoragePreferences;
@@ -240,6 +241,8 @@ class GatewayResourceProfile {
void __set_gatewayID(const std::string& val);
+ void __set_dataStorageHostName(const std::string& val);
+
void __set_credentialStoreToken(const std::string& val);
void __set_computeResourcePreferences(const std::vector<ComputeResourcePreference> & val);
@@ -250,6 +253,8 @@ class GatewayResourceProfile {
{
if (!(gatewayID == rhs.gatewayID))
return false;
+ if (!(dataStorageHostName == rhs.dataStorageHostName))
+ return false;
if (__isset.credentialStoreToken != rhs.__isset.credentialStoreToken)
return false;
else if (__isset.credentialStoreToken && !(credentialStoreToken == rhs.credentialStoreToken))
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 f63f2f0..098ec1e 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
@@ -477,6 +477,10 @@ class GatewayResourceProfile {
/**
* @var string
*/
+ public $dataStorageHostName = null;
+ /**
+ * @var string
+ */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -495,10 +499,14 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'credentialStoreToken',
+ 'var' => 'dataStorageHostName',
'type' => TType::STRING,
),
3 => array(
+ 'var' => 'credentialStoreToken',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -507,7 +515,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 4 => array(
+ 5 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -522,6 +530,9 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
+ if (isset($vals['dataStorageHostName'])) {
+ $this->dataStorageHostName = $vals['dataStorageHostName'];
+ }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -562,12 +573,19 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->credentialStoreToken);
+ $xfer += $input->readString($this->dataStorageHostName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->credentialStoreToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -585,7 +603,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -621,8 +639,13 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
+ if ($this->dataStorageHostName !== null) {
+ $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
+ $xfer += $output->writeString($this->dataStorageHostName);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -630,7 +653,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -647,7 +670,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 9799e52..0a7eaa3 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
@@ -347,6 +347,7 @@ class GatewayResourceProfile:
Attributes:
- gatewayID
+ - dataStorageHostName
- credentialStoreToken
- computeResourcePreferences
- dataStoragePreferences
@@ -355,13 +356,15 @@ class GatewayResourceProfile:
thrift_spec = (
None, # 0
(1, TType.STRING, 'gatewayID', None, None, ), # 1
- (2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
- (3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
- (4, TType.LIST, 'dataStoragePreferences', (TType.STRUCT,(DataStoragePreference, DataStoragePreference.thrift_spec)), None, ), # 4
+ (2, TType.STRING, 'dataStorageHostName', None, None, ), # 2
+ (3, TType.STRING, 'credentialStoreToken', None, None, ), # 3
+ (4, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 4
+ (5, TType.LIST, 'dataStoragePreferences', (TType.STRUCT,(DataStoragePreference, DataStoragePreference.thrift_spec)), None, ), # 5
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, dataStoragePreferences=None,):
+ def __init__(self, gatewayID=None, dataStorageHostName=None, credentialStoreToken=None, computeResourcePreferences=None, dataStoragePreferences=None,):
self.gatewayID = gatewayID
+ self.dataStorageHostName = dataStorageHostName
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
self.dataStoragePreferences = dataStoragePreferences
@@ -382,10 +385,15 @@ class GatewayResourceProfile:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.credentialStoreToken = iprot.readString();
+ self.dataStorageHostName = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 3:
+ if ftype == TType.STRING:
+ self.credentialStoreToken = iprot.readString();
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
if ftype == TType.LIST:
self.computeResourcePreferences = []
(_etype3, _size0) = iprot.readListBegin()
@@ -396,7 +404,7 @@ class GatewayResourceProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 5:
if ftype == TType.LIST:
self.dataStoragePreferences = []
(_etype9, _size6) = iprot.readListBegin()
@@ -421,19 +429,23 @@ class GatewayResourceProfile:
oprot.writeFieldBegin('gatewayID', TType.STRING, 1)
oprot.writeString(self.gatewayID)
oprot.writeFieldEnd()
+ if self.dataStorageHostName is not None:
+ oprot.writeFieldBegin('dataStorageHostName', TType.STRING, 2)
+ oprot.writeString(self.dataStorageHostName)
+ oprot.writeFieldEnd()
if self.credentialStoreToken is not None:
- oprot.writeFieldBegin('credentialStoreToken', TType.STRING, 2)
+ oprot.writeFieldBegin('credentialStoreToken', TType.STRING, 3)
oprot.writeString(self.credentialStoreToken)
oprot.writeFieldEnd()
if self.computeResourcePreferences is not None:
- oprot.writeFieldBegin('computeResourcePreferences', TType.LIST, 3)
+ oprot.writeFieldBegin('computeResourcePreferences', TType.LIST, 4)
oprot.writeListBegin(TType.STRUCT, len(self.computeResourcePreferences))
for iter12 in self.computeResourcePreferences:
iter12.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.dataStoragePreferences is not None:
- oprot.writeFieldBegin('dataStoragePreferences', TType.LIST, 4)
+ oprot.writeFieldBegin('dataStoragePreferences', TType.LIST, 5)
oprot.writeListBegin(TType.STRUCT, len(self.dataStoragePreferences))
for iter13 in self.dataStoragePreferences:
iter13.write(oprot)
@@ -445,12 +457,15 @@ class GatewayResourceProfile:
def validate(self):
if self.gatewayID is None:
raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
+ if self.dataStorageHostName is None:
+ raise TProtocol.TProtocolException(message='Required field dataStorageHostName is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.gatewayID)
+ value = (value * 31) ^ hash(self.dataStorageHostName)
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
value = (value * 31) ^ hash(self.dataStoragePreferences)
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index dbd8789..8d3708c 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -55,7 +55,7 @@ public class CreateLaunchExperiment {
//FIXME: Read from a config file
public static final String THRIFT_SERVER_HOST = "gw56.iu.xsede.org";
- public static final int THRIFT_SERVER_PORT = 8930;
+ public static final int THRIFT_SERVER_PORT = 10930;
// public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
// public static final int THRIFT_SERVER_PORT = 9930;
@@ -93,7 +93,7 @@ public class CreateLaunchExperiment {
AuthzToken token = new AuthzToken("empty_token");
System.out.println("API version is " + airavataClient.getAPIVersion(token));
// registerApplications(); // run this only the first time
- Map<String, JobStatus> jobStatuses = airavataClient.getJobStatuses(token, "Test1_Nek_a706cdc7-8abf-4db2-b7c7-13679c714e90");
+ Map<String, JobStatus> jobStatuses = airavataClient.getJobStatuses(token, "Cloneofamber_1ca82c71-b173-4f86-832d-a94b86319edf");
for (String jobId : jobStatuses.keySet()){
JobStatus jobStatus = jobStatuses.get(jobId);
System.out.println(jobId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index ec79d32..bc8fe96 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 58ffbca..810118c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 f2654f1..17ae188 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 342a8fe..52963ee 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.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 4fc223e..155b312 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.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 d46714a..694e7a4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 7c76191..4ea0f44 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 fa8a275..d02f422 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 4b8decb..877f7ff 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
index 82923c5..64fbc34 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 f5a2ad3..98f30ce 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index 2edf502..c72e160 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 5a2031f..a0d4fb8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
index 6323743..a39ced5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 8daff85..78a97fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 7e8e8e1..cae6b4c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index 2f6c6a6..ae93b66 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 f8fe5ca..60589ab 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.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
index 78b047b..d0a1a5b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 7329dca..77b0d74 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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/8ce513c2/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 66b831e..ac66415 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.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
index d6d1795..6fb6ae0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class DataStoragePreference implements org.apache.thrift.TBase<DataStoragePreference, DataStoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<DataStoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/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 edbe5dd..f111dc0 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,14 +64,15 @@ import org.slf4j.LoggerFactory;
* List of resource preferences for each of the registered compute resources.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
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");
private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayID", org.apache.thrift.protocol.TType.STRING, (short)1);
- 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 DATA_STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStoragePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField DATA_STORAGE_HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStorageHostName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ 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)3);
+ 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)4);
+ private static final org.apache.thrift.protocol.TField DATA_STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStoragePreferences", org.apache.thrift.protocol.TType.LIST, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -80,6 +81,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
private String gatewayID; // required
+ private String dataStorageHostName; // required
private String credentialStoreToken; // optional
private List<ComputeResourcePreference> computeResourcePreferences; // optional
private List<DataStoragePreference> dataStoragePreferences; // optional
@@ -87,9 +89,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
/** 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"),
- DATA_STORAGE_PREFERENCES((short)4, "dataStoragePreferences");
+ DATA_STORAGE_HOST_NAME((short)2, "dataStorageHostName"),
+ CREDENTIAL_STORE_TOKEN((short)3, "credentialStoreToken"),
+ COMPUTE_RESOURCE_PREFERENCES((short)4, "computeResourcePreferences"),
+ DATA_STORAGE_PREFERENCES((short)5, "dataStoragePreferences");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -106,11 +109,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
switch(fieldId) {
case 1: // GATEWAY_ID
return GATEWAY_ID;
- case 2: // CREDENTIAL_STORE_TOKEN
+ case 2: // DATA_STORAGE_HOST_NAME
+ return DATA_STORAGE_HOST_NAME;
+ case 3: // CREDENTIAL_STORE_TOKEN
return CREDENTIAL_STORE_TOKEN;
- case 3: // COMPUTE_RESOURCE_PREFERENCES
+ case 4: // COMPUTE_RESOURCE_PREFERENCES
return COMPUTE_RESOURCE_PREFERENCES;
- case 4: // DATA_STORAGE_PREFERENCES
+ case 5: // DATA_STORAGE_PREFERENCES
return DATA_STORAGE_PREFERENCES;
default:
return null;
@@ -158,6 +163,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayID", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.DATA_STORAGE_HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("dataStorageHostName", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("credentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.COMPUTE_RESOURCE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("computeResourcePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -174,10 +181,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
public GatewayResourceProfile(
- String gatewayID)
+ String gatewayID,
+ String dataStorageHostName)
{
this();
this.gatewayID = gatewayID;
+ this.dataStorageHostName = dataStorageHostName;
}
/**
@@ -187,6 +196,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (other.isSetGatewayID()) {
this.gatewayID = other.gatewayID;
}
+ if (other.isSetDataStorageHostName()) {
+ this.dataStorageHostName = other.dataStorageHostName;
+ }
if (other.isSetCredentialStoreToken()) {
this.credentialStoreToken = other.credentialStoreToken;
}
@@ -213,6 +225,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
@Override
public void clear() {
this.gatewayID = null;
+ this.dataStorageHostName = null;
this.credentialStoreToken = null;
this.computeResourcePreferences = null;
this.dataStoragePreferences = null;
@@ -241,6 +254,29 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
+ public String getDataStorageHostName() {
+ return this.dataStorageHostName;
+ }
+
+ public void setDataStorageHostName(String dataStorageHostName) {
+ this.dataStorageHostName = dataStorageHostName;
+ }
+
+ public void unsetDataStorageHostName() {
+ this.dataStorageHostName = null;
+ }
+
+ /** Returns true if field dataStorageHostName is set (has been assigned a value) and false otherwise */
+ public boolean isSetDataStorageHostName() {
+ return this.dataStorageHostName != null;
+ }
+
+ public void setDataStorageHostNameIsSet(boolean value) {
+ if (!value) {
+ this.dataStorageHostName = null;
+ }
+ }
+
public String getCredentialStoreToken() {
return this.credentialStoreToken;
}
@@ -350,6 +386,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
break;
+ case DATA_STORAGE_HOST_NAME:
+ if (value == null) {
+ unsetDataStorageHostName();
+ } else {
+ setDataStorageHostName((String)value);
+ }
+ break;
+
case CREDENTIAL_STORE_TOKEN:
if (value == null) {
unsetCredentialStoreToken();
@@ -382,6 +426,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
case GATEWAY_ID:
return getGatewayID();
+ case DATA_STORAGE_HOST_NAME:
+ return getDataStorageHostName();
+
case CREDENTIAL_STORE_TOKEN:
return getCredentialStoreToken();
@@ -404,6 +451,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
switch (field) {
case GATEWAY_ID:
return isSetGatewayID();
+ case DATA_STORAGE_HOST_NAME:
+ return isSetDataStorageHostName();
case CREDENTIAL_STORE_TOKEN:
return isSetCredentialStoreToken();
case COMPUTE_RESOURCE_PREFERENCES:
@@ -436,6 +485,15 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return false;
}
+ boolean this_present_dataStorageHostName = true && this.isSetDataStorageHostName();
+ boolean that_present_dataStorageHostName = true && that.isSetDataStorageHostName();
+ if (this_present_dataStorageHostName || that_present_dataStorageHostName) {
+ if (!(this_present_dataStorageHostName && that_present_dataStorageHostName))
+ return false;
+ if (!this.dataStorageHostName.equals(that.dataStorageHostName))
+ return false;
+ }
+
boolean this_present_credentialStoreToken = true && this.isSetCredentialStoreToken();
boolean that_present_credentialStoreToken = true && that.isSetCredentialStoreToken();
if (this_present_credentialStoreToken || that_present_credentialStoreToken) {
@@ -475,6 +533,11 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (present_gatewayID)
list.add(gatewayID);
+ boolean present_dataStorageHostName = true && (isSetDataStorageHostName());
+ list.add(present_dataStorageHostName);
+ if (present_dataStorageHostName)
+ list.add(dataStorageHostName);
+
boolean present_credentialStoreToken = true && (isSetCredentialStoreToken());
list.add(present_credentialStoreToken);
if (present_credentialStoreToken)
@@ -511,6 +574,16 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetDataStorageHostName()).compareTo(other.isSetDataStorageHostName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDataStorageHostName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataStorageHostName, other.dataStorageHostName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetCredentialStoreToken()).compareTo(other.isSetCredentialStoreToken());
if (lastComparison != 0) {
return lastComparison;
@@ -568,6 +641,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
sb.append(this.gatewayID);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("dataStorageHostName:");
+ if (this.dataStorageHostName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.dataStorageHostName);
+ }
+ first = false;
if (isSetCredentialStoreToken()) {
if (!first) sb.append(", ");
sb.append("credentialStoreToken:");
@@ -608,6 +689,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayID' is unset! Struct:" + toString());
}
+ if (!isSetDataStorageHostName()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataStorageHostName' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -653,7 +738,15 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // CREDENTIAL_STORE_TOKEN
+ case 2: // DATA_STORAGE_HOST_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.dataStorageHostName = iprot.readString();
+ struct.setDataStorageHostNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // CREDENTIAL_STORE_TOKEN
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.credentialStoreToken = iprot.readString();
struct.setCredentialStoreTokenIsSet(true);
@@ -661,7 +754,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // COMPUTE_RESOURCE_PREFERENCES
+ case 4: // COMPUTE_RESOURCE_PREFERENCES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -680,7 +773,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // DATA_STORAGE_PREFERENCES
+ case 5: // DATA_STORAGE_PREFERENCES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -717,6 +810,11 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
oprot.writeString(struct.gatewayID);
oprot.writeFieldEnd();
}
+ if (struct.dataStorageHostName != null) {
+ oprot.writeFieldBegin(DATA_STORAGE_HOST_NAME_FIELD_DESC);
+ oprot.writeString(struct.dataStorageHostName);
+ oprot.writeFieldEnd();
+ }
if (struct.credentialStoreToken != null) {
if (struct.isSetCredentialStoreToken()) {
oprot.writeFieldBegin(CREDENTIAL_STORE_TOKEN_FIELD_DESC);
@@ -770,6 +868,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
public void write(org.apache.thrift.protocol.TProtocol prot, GatewayResourceProfile struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.gatewayID);
+ oprot.writeString(struct.dataStorageHostName);
BitSet optionals = new BitSet();
if (struct.isSetCredentialStoreToken()) {
optionals.set(0);
@@ -809,6 +908,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.gatewayID = iprot.readString();
struct.setGatewayIDIsSet(true);
+ struct.dataStorageHostName = iprot.readString();
+ struct.setDataStorageHostNameIsSet(true);
BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
struct.credentialStoreToken = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
index 3f72027..26cee74 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index a7d6a19..32e3520 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/8ce513c2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
index 65c5abe..6033b4d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-4")
public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel");