You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/05 02:43:29 UTC
[3/4] git commit: Updating ComputeResources descriptions -
AIRAVATA-1203
Updating ComputeResources descriptions - AIRAVATA-1203
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e5688a76
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e5688a76
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e5688a76
Branch: refs/heads/master
Commit: e5688a7675692cdd2b0f17807ccc0ab202e13875
Parents: c4268c1
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Jul 4 20:43:14 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Jul 4 20:43:14 2014 -0400
----------------------------------------------------------------------
.../lib/computeResourceModel_types.cpp | 518 +++++++-----
.../resources/lib/computeResourceModel_types.h | 193 +++--
.../Model/AppCatalog/ComputeResource/Types.php | 523 ++++++++-----
.../ComputeResourceDescription.java | 483 +++++-------
.../computeresource/GlobusJobSubmission.java | 150 +---
.../computeresource/GridFTPDataMovement.java | 32 +-
.../computeresource/JobManagerCommand.java | 101 +++
.../computeresource/JobSubmissionProtocol.java | 9 +-
.../computeresource/LOCALSubmission.java | 144 +---
.../computeresource/ResourceJobManager.java | 781 ++++++++++++++++++-
.../computeresource/ResourceJobManagerType.java | 83 ++
.../computeresource/SSHJobSubmission.java | 142 +---
.../computeResourceModel.thrift | 86 +-
13 files changed, 1996 insertions(+), 1249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e5688a76/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
index 268b534..100d24d 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.cpp
@@ -10,19 +10,39 @@
-int _kResourceJobManagerValues[] = {
- ResourceJobManager::FORK,
- ResourceJobManager::PBS,
- ResourceJobManager::UGE,
- ResourceJobManager::SLURM
+int _kResourceJobManagerTypeValues[] = {
+ ResourceJobManagerType::FORK,
+ ResourceJobManagerType::PBS,
+ ResourceJobManagerType::UGE,
+ ResourceJobManagerType::SLURM
};
-const char* _kResourceJobManagerNames[] = {
+const char* _kResourceJobManagerTypeNames[] = {
"FORK",
"PBS",
"UGE",
"SLURM"
};
-const std::map<int, const char*> _ResourceJobManager_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kResourceJobManagerValues, _kResourceJobManagerNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kJobManagerCommandValues[] = {
+ JobManagerCommand::SUBMISSION,
+ JobManagerCommand::JOB_MONITORING,
+ JobManagerCommand::DELETION,
+ JobManagerCommand::CHECK_JOB,
+ JobManagerCommand::SHOW_QUEUE,
+ JobManagerCommand::SHOW_RESERVATION,
+ JobManagerCommand::SHOW_START
+};
+const char* _kJobManagerCommandNames[] = {
+ "SUBMISSION",
+ "JOB_MONITORING",
+ "DELETION",
+ "CHECK_JOB",
+ "SHOW_QUEUE",
+ "SHOW_RESERVATION",
+ "SHOW_START"
+};
+const std::map<int, const char*> _JobManagerCommand_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kJobManagerCommandValues, _kJobManagerCommandNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kFileSystemsValues[] = {
FileSystems::HOME,
@@ -59,18 +79,16 @@ const std::map<int, const char*> _SecurityProtocol_VALUES_TO_NAMES(::apache::thr
int _kJobSubmissionProtocolValues[] = {
JobSubmissionProtocol::LOCAL,
JobSubmissionProtocol::SSH,
- JobSubmissionProtocol::GSISSH,
- JobSubmissionProtocol::GRAM,
+ JobSubmissionProtocol::GLOBUS,
JobSubmissionProtocol::UNICORE
};
const char* _kJobSubmissionProtocolNames[] = {
"LOCAL",
"SSH",
- "GSISSH",
- "GRAM",
+ "GLOBUS",
"UNICORE"
};
-const std::map<int, const char*> _JobSubmissionProtocol_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kJobSubmissionProtocolValues, _kJobSubmissionProtocolNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _JobSubmissionProtocol_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kJobSubmissionProtocolValues, _kJobSubmissionProtocolNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kDataMovementProtocolValues[] = {
DataMovementProtocol::LOCAL,
@@ -88,6 +106,141 @@ const char* _kDataMovementProtocolNames[] = {
};
const std::map<int, const char*> _DataMovementProtocol_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kDataMovementProtocolValues, _kDataMovementProtocolNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const char* ResourceJobManager::ascii_fingerprint = "16E60A0DB3009C6110717701A56245C2";
+const uint8_t ResourceJobManager::binary_fingerprint[16] = {0x16,0xE6,0x0A,0x0D,0xB3,0x00,0x9C,0x61,0x10,0x71,0x77,0x01,0xA5,0x62,0x45,0xC2};
+
+uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_resourceJobManagerType = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ int32_t ecast0;
+ xfer += iprot->readI32(ecast0);
+ this->resourceJobManagerType = (ResourceJobManagerType::type)ecast0;
+ isset_resourceJobManagerType = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->pushMonitoringEndpoint);
+ this->__isset.pushMonitoringEndpoint = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->jobManagerBinPath);
+ this->__isset.jobManagerBinPath = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 4:
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->jobManagerCommands.clear();
+ uint32_t _size1;
+ ::apache::thrift::protocol::TType _ktype2;
+ ::apache::thrift::protocol::TType _vtype3;
+ xfer += iprot->readMapBegin(_ktype2, _vtype3, _size1);
+ uint32_t _i5;
+ for (_i5 = 0; _i5 < _size1; ++_i5)
+ {
+ JobManagerCommand::type _key6;
+ int32_t ecast8;
+ xfer += iprot->readI32(ecast8);
+ _key6 = (JobManagerCommand::type)ecast8;
+ std::string& _val7 = this->jobManagerCommands[_key6];
+ xfer += iprot->readString(_val7);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.jobManagerCommands = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_resourceJobManagerType)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t ResourceJobManager::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("ResourceJobManager");
+
+ xfer += oprot->writeFieldBegin("resourceJobManagerType", ::apache::thrift::protocol::T_I32, 1);
+ xfer += oprot->writeI32((int32_t)this->resourceJobManagerType);
+ xfer += oprot->writeFieldEnd();
+
+ if (this->__isset.pushMonitoringEndpoint) {
+ xfer += oprot->writeFieldBegin("pushMonitoringEndpoint", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->pushMonitoringEndpoint);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.jobManagerBinPath) {
+ xfer += oprot->writeFieldBegin("jobManagerBinPath", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->jobManagerBinPath);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.jobManagerCommands) {
+ xfer += oprot->writeFieldBegin("jobManagerCommands", ::apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->jobManagerCommands.size()));
+ std::map<JobManagerCommand::type, std::string> ::const_iterator _iter9;
+ for (_iter9 = this->jobManagerCommands.begin(); _iter9 != this->jobManagerCommands.end(); ++_iter9)
+ {
+ xfer += oprot->writeI32((int32_t)_iter9->first);
+ xfer += oprot->writeString(_iter9->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(ResourceJobManager &a, ResourceJobManager &b) {
+ using ::std::swap;
+ swap(a.resourceJobManagerType, b.resourceJobManagerType);
+ swap(a.pushMonitoringEndpoint, b.pushMonitoringEndpoint);
+ swap(a.jobManagerBinPath, b.jobManagerBinPath);
+ swap(a.jobManagerCommands, b.jobManagerCommands);
+ swap(a.__isset, b.__isset);
+}
+
const char* BatchQueue::ascii_fingerprint = "DA59FF8EE453E1822971C1CE1471EEA1";
const uint8_t BatchQueue::binary_fingerprint[16] = {0xDA,0x59,0xFF,0x8E,0xE4,0x53,0xE1,0x82,0x29,0x71,0xC1,0xCE,0x14,0x71,0xEE,0xA1};
@@ -258,9 +411,9 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast0;
- xfer += iprot->readI32(ecast0);
- this->securityProtocol = (SecurityProtocol::type)ecast0;
+ int32_t ecast10;
+ xfer += iprot->readI32(ecast10);
+ this->securityProtocol = (SecurityProtocol::type)ecast10;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -370,9 +523,9 @@ uint32_t GridFTPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot)
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast1;
- xfer += iprot->readI32(ecast1);
- this->securityProtocol = (SecurityProtocol::type)ecast1;
+ int32_t ecast11;
+ xfer += iprot->readI32(ecast11);
+ this->securityProtocol = (SecurityProtocol::type)ecast11;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -382,14 +535,14 @@ uint32_t GridFTPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->gridFTPEndPoints.clear();
- uint32_t _size2;
- ::apache::thrift::protocol::TType _etype5;
- xfer += iprot->readListBegin(_etype5, _size2);
- this->gridFTPEndPoints.resize(_size2);
- uint32_t _i6;
- for (_i6 = 0; _i6 < _size2; ++_i6)
+ uint32_t _size12;
+ ::apache::thrift::protocol::TType _etype15;
+ xfer += iprot->readListBegin(_etype15, _size12);
+ this->gridFTPEndPoints.resize(_size12);
+ uint32_t _i16;
+ for (_i16 = 0; _i16 < _size12; ++_i16)
{
- xfer += iprot->readString(this->gridFTPEndPoints[_i6]);
+ xfer += iprot->readString(this->gridFTPEndPoints[_i16]);
}
xfer += iprot->readListEnd();
}
@@ -431,10 +584,10 @@ uint32_t GridFTPDataMovement::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("gridFTPEndPoints", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->gridFTPEndPoints.size()));
- std::vector<std::string> ::const_iterator _iter7;
- for (_iter7 = this->gridFTPEndPoints.begin(); _iter7 != this->gridFTPEndPoints.end(); ++_iter7)
+ std::vector<std::string> ::const_iterator _iter17;
+ for (_iter17 = this->gridFTPEndPoints.begin(); _iter17 != this->gridFTPEndPoints.end(); ++_iter17)
{
- xfer += oprot->writeString((*_iter7));
+ xfer += oprot->writeString((*_iter17));
}
xfer += oprot->writeListEnd();
}
@@ -452,8 +605,8 @@ void swap(GridFTPDataMovement &a, GridFTPDataMovement &b) {
swap(a.gridFTPEndPoints, b.gridFTPEndPoints);
}
-const char* LOCALSubmission::ascii_fingerprint = "C9C13E23D75AC7D7DB268099D53EE995";
-const uint8_t LOCALSubmission::binary_fingerprint[16] = {0xC9,0xC1,0x3E,0x23,0xD7,0x5A,0xC7,0xD7,0xDB,0x26,0x80,0x99,0xD5,0x3E,0xE9,0x95};
+const char* LOCALSubmission::ascii_fingerprint = "D4599FCDE7AF5015D8ECB662C15BB89C";
+const uint8_t LOCALSubmission::binary_fingerprint[16] = {0xD4,0x59,0x9F,0xCD,0xE7,0xAF,0x50,0x15,0xD8,0xEC,0xB6,0x62,0xC1,0x5B,0xB8,0x9C};
uint32_t LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -485,24 +638,14 @@ uint32_t LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast8;
- xfer += iprot->readI32(ecast8);
- this->resourceJobManager = (ResourceJobManager::type)ecast8;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->resourceJobManager.read(iprot);
isset_resourceJobManager = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 6:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->monitoringMechanism);
- this->__isset.monitoringMechanism = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -527,15 +670,10 @@ uint32_t LOCALSubmission::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeString(this->jobSubmissionInterfaceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32((int32_t)this->resourceJobManager);
+ xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->resourceJobManager.write(oprot);
xfer += oprot->writeFieldEnd();
- if (this->__isset.monitoringMechanism) {
- xfer += oprot->writeFieldBegin("monitoringMechanism", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->monitoringMechanism);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -545,8 +683,6 @@ void swap(LOCALSubmission &a, LOCALSubmission &b) {
using ::std::swap;
swap(a.jobSubmissionInterfaceId, b.jobSubmissionInterfaceId);
swap(a.resourceJobManager, b.resourceJobManager);
- swap(a.monitoringMechanism, b.monitoringMechanism);
- swap(a.__isset, b.__isset);
}
const char* LOCALDataMovement::ascii_fingerprint = "EFB929595D312AC8F305D5A794CFEDA1";
@@ -613,8 +749,8 @@ void swap(LOCALDataMovement &a, LOCALDataMovement &b) {
swap(a.dataMovementInterfaceId, b.dataMovementInterfaceId);
}
-const char* SSHJobSubmission::ascii_fingerprint = "7AD7C2665ACC6606EC984DACFC74881E";
-const uint8_t SSHJobSubmission::binary_fingerprint[16] = {0x7A,0xD7,0xC2,0x66,0x5A,0xCC,0x66,0x06,0xEC,0x98,0x4D,0xAC,0xFC,0x74,0x88,0x1E};
+const char* SSHJobSubmission::ascii_fingerprint = "0A593CE0EC92EB95612E7844E2EBB8D9";
+const uint8_t SSHJobSubmission::binary_fingerprint[16] = {0x0A,0x59,0x3C,0xE0,0xEC,0x92,0xEB,0x95,0x61,0x2E,0x78,0x44,0xE2,0xEB,0xB8,0xD9};
uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -649,19 +785,17 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast9;
- xfer += iprot->readI32(ecast9);
- this->securityProtocol = (SecurityProtocol::type)ecast9;
+ int32_t ecast18;
+ xfer += iprot->readI32(ecast18);
+ this->securityProtocol = (SecurityProtocol::type)ecast18;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 3:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast10;
- xfer += iprot->readI32(ecast10);
- this->resourceJobManager = (ResourceJobManager::type)ecast10;
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->resourceJobManager.read(iprot);
isset_resourceJobManager = true;
} else {
xfer += iprot->skip(ftype);
@@ -683,14 +817,6 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 6:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->monitoringMechanism);
- this->__isset.monitoringMechanism = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -721,8 +847,8 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
xfer += oprot->writeI32((int32_t)this->securityProtocol);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32((int32_t)this->resourceJobManager);
+ xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->resourceJobManager.write(oprot);
xfer += oprot->writeFieldEnd();
if (this->__isset.alternativeSSHHostName) {
@@ -735,11 +861,6 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
xfer += oprot->writeI32(this->sshPort);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.monitoringMechanism) {
- xfer += oprot->writeFieldBegin("monitoringMechanism", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->monitoringMechanism);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -752,12 +873,11 @@ void swap(SSHJobSubmission &a, SSHJobSubmission &b) {
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.alternativeSSHHostName, b.alternativeSSHHostName);
swap(a.sshPort, b.sshPort);
- swap(a.monitoringMechanism, b.monitoringMechanism);
swap(a.__isset, b.__isset);
}
-const char* GlobusJobSubmission::ascii_fingerprint = "DF4253F78D7B543C16FA461660D38A03";
-const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0xDF,0x42,0x53,0xF7,0x8D,0x7B,0x54,0x3C,0x16,0xFA,0x46,0x16,0x60,0xD3,0x8A,0x03};
+const char* GlobusJobSubmission::ascii_fingerprint = "AF422FFD77BB68BA57079B8B33BC8CF7";
+const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0xAF,0x42,0x2F,0xFD,0x77,0xBB,0x68,0xBA,0x57,0x07,0x9B,0x8B,0x33,0xBC,0x8C,0xF7};
uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -772,7 +892,6 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
bool isset_jobSubmissionInterfaceId = false;
bool isset_securityProtocol = false;
- bool isset_resourceJobManager = false;
while (true)
{
@@ -792,36 +911,26 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast11;
- xfer += iprot->readI32(ecast11);
- this->securityProtocol = (SecurityProtocol::type)ecast11;
+ int32_t ecast19;
+ xfer += iprot->readI32(ecast19);
+ this->securityProtocol = (SecurityProtocol::type)ecast19;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 3:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast12;
- xfer += iprot->readI32(ecast12);
- this->resourceJobManager = (ResourceJobManager::type)ecast12;
- isset_resourceJobManager = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->globusGateKeeperEndPoint.clear();
- uint32_t _size13;
- ::apache::thrift::protocol::TType _etype16;
- xfer += iprot->readListBegin(_etype16, _size13);
- this->globusGateKeeperEndPoint.resize(_size13);
- uint32_t _i17;
- for (_i17 = 0; _i17 < _size13; ++_i17)
+ uint32_t _size20;
+ ::apache::thrift::protocol::TType _etype23;
+ xfer += iprot->readListBegin(_etype23, _size20);
+ this->globusGateKeeperEndPoint.resize(_size20);
+ uint32_t _i24;
+ for (_i24 = 0; _i24 < _size20; ++_i24)
{
- xfer += iprot->readString(this->globusGateKeeperEndPoint[_i17]);
+ xfer += iprot->readString(this->globusGateKeeperEndPoint[_i24]);
}
xfer += iprot->readListEnd();
}
@@ -843,8 +952,6 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_securityProtocol)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_resourceJobManager)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -860,18 +967,14 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeI32((int32_t)this->securityProtocol);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32((int32_t)this->resourceJobManager);
- xfer += oprot->writeFieldEnd();
-
if (this->__isset.globusGateKeeperEndPoint) {
- xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_LIST, 4);
+ xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->globusGateKeeperEndPoint.size()));
- std::vector<std::string> ::const_iterator _iter18;
- for (_iter18 = this->globusGateKeeperEndPoint.begin(); _iter18 != this->globusGateKeeperEndPoint.end(); ++_iter18)
+ std::vector<std::string> ::const_iterator _iter25;
+ for (_iter25 = this->globusGateKeeperEndPoint.begin(); _iter25 != this->globusGateKeeperEndPoint.end(); ++_iter25)
{
- xfer += oprot->writeString((*_iter18));
+ xfer += oprot->writeString((*_iter25));
}
xfer += oprot->writeListEnd();
}
@@ -886,7 +989,6 @@ void swap(GlobusJobSubmission &a, GlobusJobSubmission &b) {
using ::std::swap;
swap(a.jobSubmissionInterfaceId, b.jobSubmissionInterfaceId);
swap(a.securityProtocol, b.securityProtocol);
- swap(a.resourceJobManager, b.resourceJobManager);
swap(a.globusGateKeeperEndPoint, b.globusGateKeeperEndPoint);
swap(a.__isset, b.__isset);
}
@@ -927,9 +1029,9 @@ uint32_t JobSubmissionInterface::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast19;
- xfer += iprot->readI32(ecast19);
- this->jobSubmissionProtocol = (JobSubmissionProtocol::type)ecast19;
+ int32_t ecast26;
+ xfer += iprot->readI32(ecast26);
+ this->jobSubmissionProtocol = (JobSubmissionProtocol::type)ecast26;
isset_jobSubmissionProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1025,9 +1127,9 @@ uint32_t DataMovementInterface::read(::apache::thrift::protocol::TProtocol* ipro
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast20;
- xfer += iprot->readI32(ecast20);
- this->dataMovementProtocol = (DataMovementProtocol::type)ecast20;
+ int32_t ecast27;
+ xfer += iprot->readI32(ecast27);
+ this->dataMovementProtocol = (DataMovementProtocol::type)ecast27;
isset_dataMovementProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1087,8 +1189,8 @@ void swap(DataMovementInterface &a, DataMovementInterface &b) {
swap(a.priorityOrder, b.priorityOrder);
}
-const char* ComputeResourceDescription::ascii_fingerprint = "ADC1452A60F79D933D0EE4B9893AD048";
-const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0xAD,0xC1,0x45,0x2A,0x60,0xF7,0x9D,0x93,0x3D,0x0E,0xE4,0xB9,0x89,0x3A,0xD0,0x48};
+const char* ComputeResourceDescription::ascii_fingerprint = "95B7C2C0992AC1BEC9B06845F0CB3D24";
+const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0x95,0xB7,0xC2,0xC0,0x99,0x2A,0xC1,0xBE,0xC9,0xB0,0x68,0x45,0xF0,0xCB,0x3D,0x24};
uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -1141,15 +1243,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->hostAliases.clear();
- uint32_t _size21;
- ::apache::thrift::protocol::TType _etype24;
- xfer += iprot->readSetBegin(_etype24, _size21);
- uint32_t _i25;
- for (_i25 = 0; _i25 < _size21; ++_i25)
+ uint32_t _size28;
+ ::apache::thrift::protocol::TType _etype31;
+ xfer += iprot->readSetBegin(_etype31, _size28);
+ uint32_t _i32;
+ for (_i32 = 0; _i32 < _size28; ++_i32)
{
- std::string _elem26;
- xfer += iprot->readString(_elem26);
- this->hostAliases.insert(_elem26);
+ std::string _elem33;
+ xfer += iprot->readString(_elem33);
+ this->hostAliases.insert(_elem33);
}
xfer += iprot->readSetEnd();
}
@@ -1162,15 +1264,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->ipAddresses.clear();
- uint32_t _size27;
- ::apache::thrift::protocol::TType _etype30;
- xfer += iprot->readSetBegin(_etype30, _size27);
- uint32_t _i31;
- for (_i31 = 0; _i31 < _size27; ++_i31)
+ uint32_t _size34;
+ ::apache::thrift::protocol::TType _etype37;
+ xfer += iprot->readSetBegin(_etype37, _size34);
+ uint32_t _i38;
+ for (_i38 = 0; _i38 < _size34; ++_i38)
{
- std::string _elem32;
- xfer += iprot->readString(_elem32);
- this->ipAddresses.insert(_elem32);
+ std::string _elem39;
+ xfer += iprot->readString(_elem39);
+ this->ipAddresses.insert(_elem39);
}
xfer += iprot->readSetEnd();
}
@@ -1181,34 +1283,24 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
break;
case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->computeResourceDescription);
- this->__isset.computeResourceDescription = true;
+ xfer += iprot->readString(this->resourceDescription);
+ this->__isset.resourceDescription = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 7:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast33;
- xfer += iprot->readI32(ecast33);
- this->resourceJobManager = (ResourceJobManager::type)ecast33;
- this->__isset.resourceJobManager = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 8:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->batchQueues.clear();
- uint32_t _size34;
- ::apache::thrift::protocol::TType _etype37;
- xfer += iprot->readListBegin(_etype37, _size34);
- this->batchQueues.resize(_size34);
- uint32_t _i38;
- for (_i38 = 0; _i38 < _size34; ++_i38)
+ uint32_t _size40;
+ ::apache::thrift::protocol::TType _etype43;
+ xfer += iprot->readListBegin(_etype43, _size40);
+ this->batchQueues.resize(_size40);
+ uint32_t _i44;
+ for (_i44 = 0; _i44 < _size40; ++_i44)
{
- xfer += this->batchQueues[_i38].read(iprot);
+ xfer += this->batchQueues[_i44].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1217,23 +1309,23 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->fileSystems.clear();
- uint32_t _size39;
- ::apache::thrift::protocol::TType _ktype40;
- ::apache::thrift::protocol::TType _vtype41;
- xfer += iprot->readMapBegin(_ktype40, _vtype41, _size39);
- uint32_t _i43;
- for (_i43 = 0; _i43 < _size39; ++_i43)
+ uint32_t _size45;
+ ::apache::thrift::protocol::TType _ktype46;
+ ::apache::thrift::protocol::TType _vtype47;
+ xfer += iprot->readMapBegin(_ktype46, _vtype47, _size45);
+ uint32_t _i49;
+ for (_i49 = 0; _i49 < _size45; ++_i49)
{
- FileSystems::type _key44;
- int32_t ecast46;
- xfer += iprot->readI32(ecast46);
- _key44 = (FileSystems::type)ecast46;
- std::string& _val45 = this->fileSystems[_key44];
- xfer += iprot->readString(_val45);
+ FileSystems::type _key50;
+ int32_t ecast52;
+ xfer += iprot->readI32(ecast52);
+ _key50 = (FileSystems::type)ecast52;
+ std::string& _val51 = this->fileSystems[_key50];
+ xfer += iprot->readString(_val51);
}
xfer += iprot->readMapEnd();
}
@@ -1242,18 +1334,18 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->jobSubmissionInterfaces.clear();
- uint32_t _size47;
- ::apache::thrift::protocol::TType _etype50;
- xfer += iprot->readListBegin(_etype50, _size47);
- this->jobSubmissionInterfaces.resize(_size47);
- uint32_t _i51;
- for (_i51 = 0; _i51 < _size47; ++_i51)
+ uint32_t _size53;
+ ::apache::thrift::protocol::TType _etype56;
+ xfer += iprot->readListBegin(_etype56, _size53);
+ this->jobSubmissionInterfaces.resize(_size53);
+ uint32_t _i57;
+ for (_i57 = 0; _i57 < _size53; ++_i57)
{
- xfer += this->jobSubmissionInterfaces[_i51].read(iprot);
+ xfer += this->jobSubmissionInterfaces[_i57].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1262,18 +1354,18 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->dataMovemenetInterfaces.clear();
- uint32_t _size52;
- ::apache::thrift::protocol::TType _etype55;
- xfer += iprot->readListBegin(_etype55, _size52);
- this->dataMovemenetInterfaces.resize(_size52);
- uint32_t _i56;
- for (_i56 = 0; _i56 < _size52; ++_i56)
+ uint32_t _size58;
+ ::apache::thrift::protocol::TType _etype61;
+ xfer += iprot->readListBegin(_etype61, _size58);
+ this->dataMovemenetInterfaces.resize(_size58);
+ uint32_t _i62;
+ for (_i62 = 0; _i62 < _size58; ++_i62)
{
- xfer += this->dataMovemenetInterfaces[_i56].read(iprot);
+ xfer += this->dataMovemenetInterfaces[_i62].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1320,10 +1412,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size()));
- std::set<std::string> ::const_iterator _iter57;
- for (_iter57 = this->hostAliases.begin(); _iter57 != this->hostAliases.end(); ++_iter57)
+ std::set<std::string> ::const_iterator _iter63;
+ for (_iter63 = this->hostAliases.begin(); _iter63 != this->hostAliases.end(); ++_iter63)
{
- xfer += oprot->writeString((*_iter57));
+ xfer += oprot->writeString((*_iter63));
}
xfer += oprot->writeSetEnd();
}
@@ -1333,73 +1425,68 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 5);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size()));
- std::set<std::string> ::const_iterator _iter58;
- for (_iter58 = this->ipAddresses.begin(); _iter58 != this->ipAddresses.end(); ++_iter58)
+ std::set<std::string> ::const_iterator _iter64;
+ for (_iter64 = this->ipAddresses.begin(); _iter64 != this->ipAddresses.end(); ++_iter64)
{
- xfer += oprot->writeString((*_iter58));
+ xfer += oprot->writeString((*_iter64));
}
xfer += oprot->writeSetEnd();
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.computeResourceDescription) {
- xfer += oprot->writeFieldBegin("computeResourceDescription", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->computeResourceDescription);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.resourceJobManager) {
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 7);
- xfer += oprot->writeI32((int32_t)this->resourceJobManager);
+ if (this->__isset.resourceDescription) {
+ xfer += oprot->writeFieldBegin("resourceDescription", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->resourceDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.batchQueues) {
- xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 8);
+ xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->batchQueues.size()));
- std::vector<BatchQueue> ::const_iterator _iter59;
- for (_iter59 = this->batchQueues.begin(); _iter59 != this->batchQueues.end(); ++_iter59)
+ std::vector<BatchQueue> ::const_iterator _iter65;
+ for (_iter65 = this->batchQueues.begin(); _iter65 != this->batchQueues.end(); ++_iter65)
{
- xfer += (*_iter59).write(oprot);
+ xfer += (*_iter65).write(oprot);
}
xfer += oprot->writeListEnd();
}
xfer += oprot->writeFieldEnd();
}
if (this->__isset.fileSystems) {
- xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 9);
+ xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 8);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fileSystems.size()));
- std::map<FileSystems::type, std::string> ::const_iterator _iter60;
- for (_iter60 = this->fileSystems.begin(); _iter60 != this->fileSystems.end(); ++_iter60)
+ std::map<FileSystems::type, std::string> ::const_iterator _iter66;
+ for (_iter66 = this->fileSystems.begin(); _iter66 != this->fileSystems.end(); ++_iter66)
{
- xfer += oprot->writeI32((int32_t)_iter60->first);
- xfer += oprot->writeString(_iter60->second);
+ xfer += oprot->writeI32((int32_t)_iter66->first);
+ xfer += oprot->writeString(_iter66->second);
}
xfer += oprot->writeMapEnd();
}
xfer += oprot->writeFieldEnd();
}
if (this->__isset.jobSubmissionInterfaces) {
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 10);
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobSubmissionInterfaces.size()));
- std::vector<JobSubmissionInterface> ::const_iterator _iter61;
- for (_iter61 = this->jobSubmissionInterfaces.begin(); _iter61 != this->jobSubmissionInterfaces.end(); ++_iter61)
+ std::vector<JobSubmissionInterface> ::const_iterator _iter67;
+ for (_iter67 = this->jobSubmissionInterfaces.begin(); _iter67 != this->jobSubmissionInterfaces.end(); ++_iter67)
{
- xfer += (*_iter61).write(oprot);
+ xfer += (*_iter67).write(oprot);
}
xfer += oprot->writeListEnd();
}
xfer += oprot->writeFieldEnd();
}
if (this->__isset.dataMovemenetInterfaces) {
- xfer += oprot->writeFieldBegin("dataMovemenetInterfaces", ::apache::thrift::protocol::T_LIST, 11);
+ xfer += oprot->writeFieldBegin("dataMovemenetInterfaces", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovemenetInterfaces.size()));
- std::vector<DataMovementInterface> ::const_iterator _iter62;
- for (_iter62 = this->dataMovemenetInterfaces.begin(); _iter62 != this->dataMovemenetInterfaces.end(); ++_iter62)
+ std::vector<DataMovementInterface> ::const_iterator _iter68;
+ for (_iter68 = this->dataMovemenetInterfaces.begin(); _iter68 != this->dataMovemenetInterfaces.end(); ++_iter68)
{
- xfer += (*_iter62).write(oprot);
+ xfer += (*_iter68).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1417,8 +1504,7 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
swap(a.hostName, b.hostName);
swap(a.hostAliases, b.hostAliases);
swap(a.ipAddresses, b.ipAddresses);
- swap(a.computeResourceDescription, b.computeResourceDescription);
- swap(a.resourceJobManager, b.resourceJobManager);
+ swap(a.resourceDescription, b.resourceDescription);
swap(a.batchQueues, b.batchQueues);
swap(a.fileSystems, b.fileSystems);
swap(a.jobSubmissionInterfaces, b.jobSubmissionInterfaces);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e5688a76/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
index 9dff04c..fcccc18 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/computeResourceModel_types.h
@@ -17,7 +17,7 @@
-struct ResourceJobManager {
+struct ResourceJobManagerType {
enum type {
FORK = 0,
PBS = 1,
@@ -26,7 +26,21 @@ struct ResourceJobManager {
};
};
-extern const std::map<int, const char*> _ResourceJobManager_VALUES_TO_NAMES;
+extern const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES;
+
+struct JobManagerCommand {
+ enum type {
+ SUBMISSION = 0,
+ JOB_MONITORING = 1,
+ DELETION = 2,
+ CHECK_JOB = 3,
+ SHOW_QUEUE = 4,
+ SHOW_RESERVATION = 5,
+ SHOW_START = 6
+ };
+};
+
+extern const std::map<int, const char*> _JobManagerCommand_VALUES_TO_NAMES;
struct FileSystems {
enum type {
@@ -56,9 +70,8 @@ struct JobSubmissionProtocol {
enum type {
LOCAL = 0,
SSH = 1,
- GSISSH = 2,
- GRAM = 3,
- UNICORE = 4
+ GLOBUS = 2,
+ UNICORE = 3
};
};
@@ -76,6 +89,81 @@ struct DataMovementProtocol {
extern const std::map<int, const char*> _DataMovementProtocol_VALUES_TO_NAMES;
+typedef struct _ResourceJobManager__isset {
+ _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false) {}
+ bool pushMonitoringEndpoint;
+ bool jobManagerBinPath;
+ bool jobManagerCommands;
+} _ResourceJobManager__isset;
+
+class ResourceJobManager {
+ public:
+
+ static const char* ascii_fingerprint; // = "16E60A0DB3009C6110717701A56245C2";
+ static const uint8_t binary_fingerprint[16]; // = {0x16,0xE6,0x0A,0x0D,0xB3,0x00,0x9C,0x61,0x10,0x71,0x77,0x01,0xA5,0x62,0x45,0xC2};
+
+ ResourceJobManager() : resourceJobManagerType((ResourceJobManagerType::type)0), pushMonitoringEndpoint(), jobManagerBinPath() {
+ }
+
+ virtual ~ResourceJobManager() throw() {}
+
+ ResourceJobManagerType::type resourceJobManagerType;
+ std::string pushMonitoringEndpoint;
+ std::string jobManagerBinPath;
+ std::map<JobManagerCommand::type, std::string> jobManagerCommands;
+
+ _ResourceJobManager__isset __isset;
+
+ void __set_resourceJobManagerType(const ResourceJobManagerType::type val) {
+ resourceJobManagerType = val;
+ }
+
+ void __set_pushMonitoringEndpoint(const std::string& val) {
+ pushMonitoringEndpoint = val;
+ __isset.pushMonitoringEndpoint = true;
+ }
+
+ void __set_jobManagerBinPath(const std::string& val) {
+ jobManagerBinPath = val;
+ __isset.jobManagerBinPath = true;
+ }
+
+ void __set_jobManagerCommands(const std::map<JobManagerCommand::type, std::string> & val) {
+ jobManagerCommands = val;
+ __isset.jobManagerCommands = true;
+ }
+
+ bool operator == (const ResourceJobManager & rhs) const
+ {
+ if (!(resourceJobManagerType == rhs.resourceJobManagerType))
+ return false;
+ if (__isset.pushMonitoringEndpoint != rhs.__isset.pushMonitoringEndpoint)
+ return false;
+ else if (__isset.pushMonitoringEndpoint && !(pushMonitoringEndpoint == rhs.pushMonitoringEndpoint))
+ return false;
+ if (__isset.jobManagerBinPath != rhs.__isset.jobManagerBinPath)
+ return false;
+ else if (__isset.jobManagerBinPath && !(jobManagerBinPath == rhs.jobManagerBinPath))
+ return false;
+ if (__isset.jobManagerCommands != rhs.__isset.jobManagerCommands)
+ return false;
+ else if (__isset.jobManagerCommands && !(jobManagerCommands == rhs.jobManagerCommands))
+ return false;
+ return true;
+ }
+ bool operator != (const ResourceJobManager &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const ResourceJobManager & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+void swap(ResourceJobManager &a, ResourceJobManager &b);
+
typedef struct _BatchQueue__isset {
_BatchQueue__isset() : queueDescription(false), maxRunTime(false), maxNodes(false), maxProcessors(false), maxJobsInQueue(false) {}
bool queueDescription;
@@ -295,51 +383,35 @@ class GridFTPDataMovement {
void swap(GridFTPDataMovement &a, GridFTPDataMovement &b);
-typedef struct _LOCALSubmission__isset {
- _LOCALSubmission__isset() : monitoringMechanism(false) {}
- bool monitoringMechanism;
-} _LOCALSubmission__isset;
class LOCALSubmission {
public:
- static const char* ascii_fingerprint; // = "C9C13E23D75AC7D7DB268099D53EE995";
- static const uint8_t binary_fingerprint[16]; // = {0xC9,0xC1,0x3E,0x23,0xD7,0x5A,0xC7,0xD7,0xDB,0x26,0x80,0x99,0xD5,0x3E,0xE9,0x95};
+ static const char* ascii_fingerprint; // = "D4599FCDE7AF5015D8ECB662C15BB89C";
+ static const uint8_t binary_fingerprint[16]; // = {0xD4,0x59,0x9F,0xCD,0xE7,0xAF,0x50,0x15,0xD8,0xEC,0xB6,0x62,0xC1,0x5B,0xB8,0x9C};
- LOCALSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS"), resourceJobManager((ResourceJobManager::type)0), monitoringMechanism() {
+ LOCALSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS") {
}
virtual ~LOCALSubmission() throw() {}
std::string jobSubmissionInterfaceId;
- ResourceJobManager::type resourceJobManager;
- std::string monitoringMechanism;
-
- _LOCALSubmission__isset __isset;
+ ResourceJobManager resourceJobManager;
void __set_jobSubmissionInterfaceId(const std::string& val) {
jobSubmissionInterfaceId = val;
}
- void __set_resourceJobManager(const ResourceJobManager::type val) {
+ void __set_resourceJobManager(const ResourceJobManager& val) {
resourceJobManager = val;
}
- void __set_monitoringMechanism(const std::string& val) {
- monitoringMechanism = val;
- __isset.monitoringMechanism = true;
- }
-
bool operator == (const LOCALSubmission & rhs) const
{
if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
return false;
if (!(resourceJobManager == rhs.resourceJobManager))
return false;
- if (__isset.monitoringMechanism != rhs.__isset.monitoringMechanism)
- return false;
- else if (__isset.monitoringMechanism && !(monitoringMechanism == rhs.monitoringMechanism))
- return false;
return true;
}
bool operator != (const LOCALSubmission &rhs) const {
@@ -393,29 +465,27 @@ class LOCALDataMovement {
void swap(LOCALDataMovement &a, LOCALDataMovement &b);
typedef struct _SSHJobSubmission__isset {
- _SSHJobSubmission__isset() : alternativeSSHHostName(false), sshPort(true), monitoringMechanism(false) {}
+ _SSHJobSubmission__isset() : alternativeSSHHostName(false), sshPort(true) {}
bool alternativeSSHHostName;
bool sshPort;
- bool monitoringMechanism;
} _SSHJobSubmission__isset;
class SSHJobSubmission {
public:
- static const char* ascii_fingerprint; // = "7AD7C2665ACC6606EC984DACFC74881E";
- static const uint8_t binary_fingerprint[16]; // = {0x7A,0xD7,0xC2,0x66,0x5A,0xCC,0x66,0x06,0xEC,0x98,0x4D,0xAC,0xFC,0x74,0x88,0x1E};
+ static const char* ascii_fingerprint; // = "0A593CE0EC92EB95612E7844E2EBB8D9";
+ static const uint8_t binary_fingerprint[16]; // = {0x0A,0x59,0x3C,0xE0,0xEC,0x92,0xEB,0x95,0x61,0x2E,0x78,0x44,0xE2,0xEB,0xB8,0xD9};
- SSHJobSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), resourceJobManager((ResourceJobManager::type)0), alternativeSSHHostName(), sshPort(22), monitoringMechanism() {
+ SSHJobSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), alternativeSSHHostName(), sshPort(22) {
}
virtual ~SSHJobSubmission() throw() {}
std::string jobSubmissionInterfaceId;
SecurityProtocol::type securityProtocol;
- ResourceJobManager::type resourceJobManager;
+ ResourceJobManager resourceJobManager;
std::string alternativeSSHHostName;
int32_t sshPort;
- std::string monitoringMechanism;
_SSHJobSubmission__isset __isset;
@@ -427,7 +497,7 @@ class SSHJobSubmission {
securityProtocol = val;
}
- void __set_resourceJobManager(const ResourceJobManager::type val) {
+ void __set_resourceJobManager(const ResourceJobManager& val) {
resourceJobManager = val;
}
@@ -441,11 +511,6 @@ class SSHJobSubmission {
__isset.sshPort = true;
}
- void __set_monitoringMechanism(const std::string& val) {
- monitoringMechanism = val;
- __isset.monitoringMechanism = true;
- }
-
bool operator == (const SSHJobSubmission & rhs) const
{
if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
@@ -462,10 +527,6 @@ class SSHJobSubmission {
return false;
else if (__isset.sshPort && !(sshPort == rhs.sshPort))
return false;
- if (__isset.monitoringMechanism != rhs.__isset.monitoringMechanism)
- return false;
- else if (__isset.monitoringMechanism && !(monitoringMechanism == rhs.monitoringMechanism))
- return false;
return true;
}
bool operator != (const SSHJobSubmission &rhs) const {
@@ -489,17 +550,16 @@ typedef struct _GlobusJobSubmission__isset {
class GlobusJobSubmission {
public:
- static const char* ascii_fingerprint; // = "DF4253F78D7B543C16FA461660D38A03";
- static const uint8_t binary_fingerprint[16]; // = {0xDF,0x42,0x53,0xF7,0x8D,0x7B,0x54,0x3C,0x16,0xFA,0x46,0x16,0x60,0xD3,0x8A,0x03};
+ static const char* ascii_fingerprint; // = "AF422FFD77BB68BA57079B8B33BC8CF7";
+ static const uint8_t binary_fingerprint[16]; // = {0xAF,0x42,0x2F,0xFD,0x77,0xBB,0x68,0xBA,0x57,0x07,0x9B,0x8B,0x33,0xBC,0x8C,0xF7};
- GlobusJobSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0), resourceJobManager((ResourceJobManager::type)0) {
+ GlobusJobSubmission() : jobSubmissionInterfaceId("DO_NOT_SET_AT_CLIENTS"), securityProtocol((SecurityProtocol::type)0) {
}
virtual ~GlobusJobSubmission() throw() {}
std::string jobSubmissionInterfaceId;
SecurityProtocol::type securityProtocol;
- ResourceJobManager::type resourceJobManager;
std::vector<std::string> globusGateKeeperEndPoint;
_GlobusJobSubmission__isset __isset;
@@ -512,10 +572,6 @@ class GlobusJobSubmission {
securityProtocol = val;
}
- void __set_resourceJobManager(const ResourceJobManager::type val) {
- resourceJobManager = val;
- }
-
void __set_globusGateKeeperEndPoint(const std::vector<std::string> & val) {
globusGateKeeperEndPoint = val;
__isset.globusGateKeeperEndPoint = true;
@@ -527,8 +583,6 @@ class GlobusJobSubmission {
return false;
if (!(securityProtocol == rhs.securityProtocol))
return false;
- if (!(resourceJobManager == rhs.resourceJobManager))
- return false;
if (__isset.globusGateKeeperEndPoint != rhs.__isset.globusGateKeeperEndPoint)
return false;
else if (__isset.globusGateKeeperEndPoint && !(globusGateKeeperEndPoint == rhs.globusGateKeeperEndPoint))
@@ -651,11 +705,10 @@ class DataMovementInterface {
void swap(DataMovementInterface &a, DataMovementInterface &b);
typedef struct _ComputeResourceDescription__isset {
- _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), computeResourceDescription(false), resourceJobManager(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovemenetInterfaces(false) {}
+ _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovemenetInterfaces(false) {}
bool hostAliases;
bool ipAddresses;
- bool computeResourceDescription;
- bool resourceJobManager;
+ bool resourceDescription;
bool batchQueues;
bool fileSystems;
bool jobSubmissionInterfaces;
@@ -665,10 +718,10 @@ typedef struct _ComputeResourceDescription__isset {
class ComputeResourceDescription {
public:
- static const char* ascii_fingerprint; // = "ADC1452A60F79D933D0EE4B9893AD048";
- static const uint8_t binary_fingerprint[16]; // = {0xAD,0xC1,0x45,0x2A,0x60,0xF7,0x9D,0x93,0x3D,0x0E,0xE4,0xB9,0x89,0x3A,0xD0,0x48};
+ static const char* ascii_fingerprint; // = "95B7C2C0992AC1BEC9B06845F0CB3D24";
+ static const uint8_t binary_fingerprint[16]; // = {0x95,0xB7,0xC2,0xC0,0x99,0x2A,0xC1,0xBE,0xC9,0xB0,0x68,0x45,0xF0,0xCB,0x3D,0x24};
- ComputeResourceDescription() : isEmpty(false), computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), computeResourceDescription(), resourceJobManager((ResourceJobManager::type)0) {
+ ComputeResourceDescription() : isEmpty(false), computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription() {
}
virtual ~ComputeResourceDescription() throw() {}
@@ -678,8 +731,7 @@ class ComputeResourceDescription {
std::string hostName;
std::set<std::string> hostAliases;
std::set<std::string> ipAddresses;
- std::string computeResourceDescription;
- ResourceJobManager::type resourceJobManager;
+ std::string resourceDescription;
std::vector<BatchQueue> batchQueues;
std::map<FileSystems::type, std::string> fileSystems;
std::vector<JobSubmissionInterface> jobSubmissionInterfaces;
@@ -709,14 +761,9 @@ class ComputeResourceDescription {
__isset.ipAddresses = true;
}
- void __set_computeResourceDescription(const std::string& val) {
- computeResourceDescription = val;
- __isset.computeResourceDescription = true;
- }
-
- void __set_resourceJobManager(const ResourceJobManager::type val) {
- resourceJobManager = val;
- __isset.resourceJobManager = true;
+ void __set_resourceDescription(const std::string& val) {
+ resourceDescription = val;
+ __isset.resourceDescription = true;
}
void __set_batchQueues(const std::vector<BatchQueue> & val) {
@@ -755,13 +802,9 @@ class ComputeResourceDescription {
return false;
else if (__isset.ipAddresses && !(ipAddresses == rhs.ipAddresses))
return false;
- if (__isset.computeResourceDescription != rhs.__isset.computeResourceDescription)
- return false;
- else if (__isset.computeResourceDescription && !(computeResourceDescription == rhs.computeResourceDescription))
- return false;
- if (__isset.resourceJobManager != rhs.__isset.resourceJobManager)
+ if (__isset.resourceDescription != rhs.__isset.resourceDescription)
return false;
- else if (__isset.resourceJobManager && !(resourceJobManager == rhs.resourceJobManager))
+ else if (__isset.resourceDescription && !(resourceDescription == rhs.resourceDescription))
return false;
if (__isset.batchQueues != rhs.__isset.batchQueues)
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e5688a76/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index ceaa246..6267bbf 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -17,7 +17,7 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
-final class ResourceJobManager {
+final class ResourceJobManagerType {
const FORK = 0;
const PBS = 1;
const UGE = 2;
@@ -30,6 +30,25 @@ final class ResourceJobManager {
);
}
+final class JobManagerCommand {
+ const SUBMISSION = 0;
+ const JOB_MONITORING = 1;
+ const DELETION = 2;
+ const CHECK_JOB = 3;
+ const SHOW_QUEUE = 4;
+ const SHOW_RESERVATION = 5;
+ const SHOW_START = 6;
+ static public $__names = array(
+ 0 => 'SUBMISSION',
+ 1 => 'JOB_MONITORING',
+ 2 => 'DELETION',
+ 3 => 'CHECK_JOB',
+ 4 => 'SHOW_QUEUE',
+ 5 => 'SHOW_RESERVATION',
+ 6 => 'SHOW_START',
+ );
+}
+
final class FileSystems {
const HOME = 0;
const WORK = 1;
@@ -63,15 +82,13 @@ final class SecurityProtocol {
final class JobSubmissionProtocol {
const LOCAL = 0;
const SSH = 1;
- const GSISSH = 2;
- const GRAM = 3;
- const UNICORE = 4;
+ const GLOBUS = 2;
+ const UNICORE = 3;
static public $__names = array(
0 => 'LOCAL',
1 => 'SSH',
- 2 => 'GSISSH',
- 3 => 'GRAM',
- 4 => 'UNICORE',
+ 2 => 'GLOBUS',
+ 3 => 'UNICORE',
);
}
@@ -90,6 +107,172 @@ final class DataMovementProtocol {
);
}
+class ResourceJobManager {
+ static $_TSPEC;
+
+ public $resourceJobManagerType = null;
+ public $pushMonitoringEndpoint = null;
+ public $jobManagerBinPath = null;
+ public $jobManagerCommands = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'resourceJobManagerType',
+ 'type' => TType::I32,
+ ),
+ 2 => array(
+ 'var' => 'pushMonitoringEndpoint',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'jobManagerBinPath',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'jobManagerCommands',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['resourceJobManagerType'])) {
+ $this->resourceJobManagerType = $vals['resourceJobManagerType'];
+ }
+ if (isset($vals['pushMonitoringEndpoint'])) {
+ $this->pushMonitoringEndpoint = $vals['pushMonitoringEndpoint'];
+ }
+ if (isset($vals['jobManagerBinPath'])) {
+ $this->jobManagerBinPath = $vals['jobManagerBinPath'];
+ }
+ if (isset($vals['jobManagerCommands'])) {
+ $this->jobManagerCommands = $vals['jobManagerCommands'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'ResourceJobManager';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->resourceJobManagerType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->pushMonitoringEndpoint);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->jobManagerBinPath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::MAP) {
+ $this->jobManagerCommands = array();
+ $_size0 = 0;
+ $_ktype1 = 0;
+ $_vtype2 = 0;
+ $xfer += $input->readMapBegin($_ktype1, $_vtype2, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $key5 = 0;
+ $val6 = '';
+ $xfer += $input->readI32($key5);
+ $xfer += $input->readString($val6);
+ $this->jobManagerCommands[$key5] = $val6;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('ResourceJobManager');
+ if ($this->resourceJobManagerType !== null) {
+ $xfer += $output->writeFieldBegin('resourceJobManagerType', TType::I32, 1);
+ $xfer += $output->writeI32($this->resourceJobManagerType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->pushMonitoringEndpoint !== null) {
+ $xfer += $output->writeFieldBegin('pushMonitoringEndpoint', TType::STRING, 2);
+ $xfer += $output->writeString($this->pushMonitoringEndpoint);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->jobManagerBinPath !== null) {
+ $xfer += $output->writeFieldBegin('jobManagerBinPath', TType::STRING, 3);
+ $xfer += $output->writeString($this->jobManagerBinPath);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->jobManagerCommands !== null) {
+ if (!is_array($this->jobManagerCommands)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('jobManagerCommands', TType::MAP, 4);
+ {
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->jobManagerCommands));
+ {
+ foreach ($this->jobManagerCommands as $kiter7 => $viter8)
+ {
+ $xfer += $output->writeI32($kiter7);
+ $xfer += $output->writeString($viter8);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
class BatchQueue {
static $_TSPEC;
@@ -471,14 +654,14 @@ class GridFTPDataMovement {
case 3:
if ($ftype == TType::LST) {
$this->gridFTPEndPoints = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size9 = 0;
+ $_etype12 = 0;
+ $xfer += $input->readListBegin($_etype12, $_size9);
+ for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
{
- $elem5 = null;
- $xfer += $input->readString($elem5);
- $this->gridFTPEndPoints []= $elem5;
+ $elem14 = null;
+ $xfer += $input->readString($elem14);
+ $this->gridFTPEndPoints []= $elem14;
}
$xfer += $input->readListEnd();
} else {
@@ -516,9 +699,9 @@ class GridFTPDataMovement {
{
$output->writeListBegin(TType::STRING, count($this->gridFTPEndPoints));
{
- foreach ($this->gridFTPEndPoints as $iter6)
+ foreach ($this->gridFTPEndPoints as $iter15)
{
- $xfer += $output->writeString($iter6);
+ $xfer += $output->writeString($iter15);
}
}
$output->writeListEnd();
@@ -537,7 +720,6 @@ class LOCALSubmission {
public $jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
public $resourceJobManager = null;
- public $monitoringMechanism = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -546,13 +728,10 @@ class LOCALSubmission {
'var' => 'jobSubmissionInterfaceId',
'type' => TType::STRING,
),
- 3 => array(
+ 2 => array(
'var' => 'resourceJobManager',
- 'type' => TType::I32,
- ),
- 6 => array(
- 'var' => 'monitoringMechanism',
- 'type' => TType::STRING,
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager',
),
);
}
@@ -563,9 +742,6 @@ class LOCALSubmission {
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
}
- if (isset($vals['monitoringMechanism'])) {
- $this->monitoringMechanism = $vals['monitoringMechanism'];
- }
}
}
@@ -595,16 +771,10 @@ class LOCALSubmission {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->resourceJobManager);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->monitoringMechanism);
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
+ $xfer += $this->resourceJobManager->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -628,13 +798,11 @@ class LOCALSubmission {
$xfer += $output->writeFieldEnd();
}
if ($this->resourceJobManager !== null) {
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::I32, 3);
- $xfer += $output->writeI32($this->resourceJobManager);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->monitoringMechanism !== null) {
- $xfer += $output->writeFieldBegin('monitoringMechanism', TType::STRING, 6);
- $xfer += $output->writeString($this->monitoringMechanism);
+ if (!is_object($this->resourceJobManager)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 2);
+ $xfer += $this->resourceJobManager->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -724,7 +892,6 @@ class SSHJobSubmission {
public $resourceJobManager = null;
public $alternativeSSHHostName = null;
public $sshPort = 22;
- public $monitoringMechanism = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -739,7 +906,8 @@ class SSHJobSubmission {
),
3 => array(
'var' => 'resourceJobManager',
- 'type' => TType::I32,
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager',
),
4 => array(
'var' => 'alternativeSSHHostName',
@@ -749,10 +917,6 @@ class SSHJobSubmission {
'var' => 'sshPort',
'type' => TType::I32,
),
- 6 => array(
- 'var' => 'monitoringMechanism',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -771,9 +935,6 @@ class SSHJobSubmission {
if (isset($vals['sshPort'])) {
$this->sshPort = $vals['sshPort'];
}
- if (isset($vals['monitoringMechanism'])) {
- $this->monitoringMechanism = $vals['monitoringMechanism'];
- }
}
}
@@ -811,8 +972,9 @@ class SSHJobSubmission {
}
break;
case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->resourceJobManager);
+ if ($ftype == TType::STRUCT) {
+ $this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
+ $xfer += $this->resourceJobManager->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -831,13 +993,6 @@ class SSHJobSubmission {
$xfer += $input->skip($ftype);
}
break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->monitoringMechanism);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -862,8 +1017,11 @@ class SSHJobSubmission {
$xfer += $output->writeFieldEnd();
}
if ($this->resourceJobManager !== null) {
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::I32, 3);
- $xfer += $output->writeI32($this->resourceJobManager);
+ if (!is_object($this->resourceJobManager)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 3);
+ $xfer += $this->resourceJobManager->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->alternativeSSHHostName !== null) {
@@ -876,11 +1034,6 @@ class SSHJobSubmission {
$xfer += $output->writeI32($this->sshPort);
$xfer += $output->writeFieldEnd();
}
- if ($this->monitoringMechanism !== null) {
- $xfer += $output->writeFieldBegin('monitoringMechanism', TType::STRING, 6);
- $xfer += $output->writeString($this->monitoringMechanism);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -893,7 +1046,6 @@ class GlobusJobSubmission {
public $jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
public $securityProtocol = null;
- public $resourceJobManager = null;
public $globusGateKeeperEndPoint = null;
public function __construct($vals=null) {
@@ -908,10 +1060,6 @@ class GlobusJobSubmission {
'type' => TType::I32,
),
3 => array(
- 'var' => 'resourceJobManager',
- 'type' => TType::I32,
- ),
- 4 => array(
'var' => 'globusGateKeeperEndPoint',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -928,9 +1076,6 @@ class GlobusJobSubmission {
if (isset($vals['securityProtocol'])) {
$this->securityProtocol = $vals['securityProtocol'];
}
- if (isset($vals['resourceJobManager'])) {
- $this->resourceJobManager = $vals['resourceJobManager'];
- }
if (isset($vals['globusGateKeeperEndPoint'])) {
$this->globusGateKeeperEndPoint = $vals['globusGateKeeperEndPoint'];
}
@@ -971,23 +1116,16 @@ class GlobusJobSubmission {
}
break;
case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->resourceJobManager);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
if ($ftype == TType::LST) {
$this->globusGateKeeperEndPoint = array();
- $_size7 = 0;
- $_etype10 = 0;
- $xfer += $input->readListBegin($_etype10, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ $_size16 = 0;
+ $_etype19 = 0;
+ $xfer += $input->readListBegin($_etype19, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
{
- $elem12 = null;
- $xfer += $input->readString($elem12);
- $this->globusGateKeeperEndPoint []= $elem12;
+ $elem21 = null;
+ $xfer += $input->readString($elem21);
+ $this->globusGateKeeperEndPoint []= $elem21;
}
$xfer += $input->readListEnd();
} else {
@@ -1017,22 +1155,17 @@ class GlobusJobSubmission {
$xfer += $output->writeI32($this->securityProtocol);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceJobManager !== null) {
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::I32, 3);
- $xfer += $output->writeI32($this->resourceJobManager);
- $xfer += $output->writeFieldEnd();
- }
if ($this->globusGateKeeperEndPoint !== null) {
if (!is_array($this->globusGateKeeperEndPoint)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('globusGateKeeperEndPoint', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('globusGateKeeperEndPoint', TType::LST, 3);
{
$output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
{
- foreach ($this->globusGateKeeperEndPoint as $iter13)
+ foreach ($this->globusGateKeeperEndPoint as $iter22)
{
- $xfer += $output->writeString($iter13);
+ $xfer += $output->writeString($iter22);
}
}
$output->writeListEnd();
@@ -1278,8 +1411,7 @@ class ComputeResourceDescription {
public $hostName = null;
public $hostAliases = null;
public $ipAddresses = null;
- public $computeResourceDescription = null;
- public $resourceJobManager = null;
+ public $resourceDescription = null;
public $batchQueues = null;
public $fileSystems = null;
public $jobSubmissionInterfaces = null;
@@ -1317,14 +1449,10 @@ class ComputeResourceDescription {
),
),
6 => array(
- 'var' => 'computeResourceDescription',
+ 'var' => 'resourceDescription',
'type' => TType::STRING,
),
7 => array(
- 'var' => 'resourceJobManager',
- 'type' => TType::I32,
- ),
- 8 => array(
'var' => 'batchQueues',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1333,7 +1461,7 @@ class ComputeResourceDescription {
'class' => '\Airavata\Model\AppCatalog\ComputeResource\BatchQueue',
),
),
- 9 => array(
+ 8 => array(
'var' => 'fileSystems',
'type' => TType::MAP,
'ktype' => TType::I32,
@@ -1345,7 +1473,7 @@ class ComputeResourceDescription {
'type' => TType::STRING,
),
),
- 10 => array(
+ 9 => array(
'var' => 'jobSubmissionInterfaces',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1354,7 +1482,7 @@ class ComputeResourceDescription {
'class' => '\Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface',
),
),
- 11 => array(
+ 10 => array(
'var' => 'dataMovemenetInterfaces',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -1381,11 +1509,8 @@ class ComputeResourceDescription {
if (isset($vals['ipAddresses'])) {
$this->ipAddresses = $vals['ipAddresses'];
}
- if (isset($vals['computeResourceDescription'])) {
- $this->computeResourceDescription = $vals['computeResourceDescription'];
- }
- if (isset($vals['resourceJobManager'])) {
- $this->resourceJobManager = $vals['resourceJobManager'];
+ if (isset($vals['resourceDescription'])) {
+ $this->resourceDescription = $vals['resourceDescription'];
}
if (isset($vals['batchQueues'])) {
$this->batchQueues = $vals['batchQueues'];
@@ -1445,17 +1570,17 @@ class ComputeResourceDescription {
case 4:
if ($ftype == TType::SET) {
$this->hostAliases = array();
- $_size14 = 0;
- $_etype17 = 0;
- $xfer += $input->readSetBegin($_etype17, $_size14);
- for ($_i18 = 0; $_i18 < $_size14; ++$_i18)
+ $_size23 = 0;
+ $_etype26 = 0;
+ $xfer += $input->readSetBegin($_etype26, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
{
- $elem19 = null;
- $xfer += $input->readString($elem19);
- if (is_scalar($elem19)) {
- $this->hostAliases[$elem19] = true;
+ $elem28 = null;
+ $xfer += $input->readString($elem28);
+ if (is_scalar($elem28)) {
+ $this->hostAliases[$elem28] = true;
} else {
- $this->hostAliases []= $elem19;
+ $this->hostAliases []= $elem28;
}
}
$xfer += $input->readSetEnd();
@@ -1466,17 +1591,17 @@ class ComputeResourceDescription {
case 5:
if ($ftype == TType::SET) {
$this->ipAddresses = array();
- $_size20 = 0;
- $_etype23 = 0;
- $xfer += $input->readSetBegin($_etype23, $_size20);
- for ($_i24 = 0; $_i24 < $_size20; ++$_i24)
+ $_size29 = 0;
+ $_etype32 = 0;
+ $xfer += $input->readSetBegin($_etype32, $_size29);
+ for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
{
- $elem25 = null;
- $xfer += $input->readString($elem25);
- if (is_scalar($elem25)) {
- $this->ipAddresses[$elem25] = true;
+ $elem34 = null;
+ $xfer += $input->readString($elem34);
+ if (is_scalar($elem34)) {
+ $this->ipAddresses[$elem34] = true;
} else {
- $this->ipAddresses []= $elem25;
+ $this->ipAddresses []= $elem34;
}
}
$xfer += $input->readSetEnd();
@@ -1486,86 +1611,79 @@ class ComputeResourceDescription {
break;
case 6:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceDescription);
+ $xfer += $input->readString($this->resourceDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
case 7:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->resourceJobManager);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 8:
if ($ftype == TType::LST) {
$this->batchQueues = array();
- $_size26 = 0;
- $_etype29 = 0;
- $xfer += $input->readListBegin($_etype29, $_size26);
- for ($_i30 = 0; $_i30 < $_size26; ++$_i30)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readListBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem31 = null;
- $elem31 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
- $xfer += $elem31->read($input);
- $this->batchQueues []= $elem31;
+ $elem40 = null;
+ $elem40 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
+ $xfer += $elem40->read($input);
+ $this->batchQueues []= $elem40;
}
$xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::MAP) {
$this->fileSystems = array();
- $_size32 = 0;
- $_ktype33 = 0;
- $_vtype34 = 0;
- $xfer += $input->readMapBegin($_ktype33, $_vtype34, $_size32);
- for ($_i36 = 0; $_i36 < $_size32; ++$_i36)
+ $_size41 = 0;
+ $_ktype42 = 0;
+ $_vtype43 = 0;
+ $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $key37 = 0;
- $val38 = '';
- $xfer += $input->readI32($key37);
- $xfer += $input->readString($val38);
- $this->fileSystems[$key37] = $val38;
+ $key46 = 0;
+ $val47 = '';
+ $xfer += $input->readI32($key46);
+ $xfer += $input->readString($val47);
+ $this->fileSystems[$key46] = $val47;
}
$xfer += $input->readMapEnd();
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::LST) {
$this->jobSubmissionInterfaces = array();
- $_size39 = 0;
- $_etype42 = 0;
- $xfer += $input->readListBegin($_etype42, $_size39);
- for ($_i43 = 0; $_i43 < $_size39; ++$_i43)
+ $_size48 = 0;
+ $_etype51 = 0;
+ $xfer += $input->readListBegin($_etype51, $_size48);
+ for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
{
- $elem44 = null;
- $elem44 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
- $xfer += $elem44->read($input);
- $this->jobSubmissionInterfaces []= $elem44;
+ $elem53 = null;
+ $elem53 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
+ $xfer += $elem53->read($input);
+ $this->jobSubmissionInterfaces []= $elem53;
}
$xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::LST) {
$this->dataMovemenetInterfaces = array();
- $_size45 = 0;
- $_etype48 = 0;
- $xfer += $input->readListBegin($_etype48, $_size45);
- for ($_i49 = 0; $_i49 < $_size45; ++$_i49)
+ $_size54 = 0;
+ $_etype57 = 0;
+ $xfer += $input->readListBegin($_etype57, $_size54);
+ for ($_i58 = 0; $_i58 < $_size54; ++$_i58)
{
- $elem50 = null;
- $elem50 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
- $xfer += $elem50->read($input);
- $this->dataMovemenetInterfaces []= $elem50;
+ $elem59 = null;
+ $elem59 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
+ $xfer += $elem59->read($input);
+ $this->dataMovemenetInterfaces []= $elem59;
}
$xfer += $input->readListEnd();
} else {
@@ -1608,12 +1726,12 @@ class ComputeResourceDescription {
{
$output->writeSetBegin(TType::STRING, count($this->hostAliases));
{
- foreach ($this->hostAliases as $iter51 => $iter52)
+ foreach ($this->hostAliases as $iter60 => $iter61)
{
- if (is_scalar($iter52)) {
- $xfer += $output->writeString($iter51);
+ if (is_scalar($iter61)) {
+ $xfer += $output->writeString($iter60);
} else {
- $xfer += $output->writeString($iter52);
+ $xfer += $output->writeString($iter61);
}
}
}
@@ -1629,12 +1747,12 @@ class ComputeResourceDescription {
{
$output->writeSetBegin(TType::STRING, count($this->ipAddresses));
{
- foreach ($this->ipAddresses as $iter53 => $iter54)
+ foreach ($this->ipAddresses as $iter62 => $iter63)
{
- if (is_scalar($iter54)) {
- $xfer += $output->writeString($iter53);
+ if (is_scalar($iter63)) {
+ $xfer += $output->writeString($iter62);
} else {
- $xfer += $output->writeString($iter54);
+ $xfer += $output->writeString($iter63);
}
}
}
@@ -1642,27 +1760,22 @@ class ComputeResourceDescription {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceDescription !== null) {
- $xfer += $output->writeFieldBegin('computeResourceDescription', TType::STRING, 6);
- $xfer += $output->writeString($this->computeResourceDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->resourceJobManager !== null) {
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::I32, 7);
- $xfer += $output->writeI32($this->resourceJobManager);
+ if ($this->resourceDescription !== null) {
+ $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 6);
+ $xfer += $output->writeString($this->resourceDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->batchQueues !== null) {
if (!is_array($this->batchQueues)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 8);
+ $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 7);
{
$output->writeListBegin(TType::STRUCT, count($this->batchQueues));
{
- foreach ($this->batchQueues as $iter55)
+ foreach ($this->batchQueues as $iter64)
{
- $xfer += $iter55->write($output);
+ $xfer += $iter64->write($output);
}
}
$output->writeListEnd();
@@ -1673,14 +1786,14 @@ class ComputeResourceDescription {
if (!is_array($this->fileSystems)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 9);
+ $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 8);
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
{
- foreach ($this->fileSystems as $kiter56 => $viter57)
+ foreach ($this->fileSystems as $kiter65 => $viter66)
{
- $xfer += $output->writeI32($kiter56);
- $xfer += $output->writeString($viter57);
+ $xfer += $output->writeI32($kiter65);
+ $xfer += $output->writeString($viter66);
}
}
$output->writeMapEnd();
@@ -1691,13 +1804,13 @@ class ComputeResourceDescription {
if (!is_array($this->jobSubmissionInterfaces)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 9);
{
$output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
{
- foreach ($this->jobSubmissionInterfaces as $iter58)
+ foreach ($this->jobSubmissionInterfaces as $iter67)
{
- $xfer += $iter58->write($output);
+ $xfer += $iter67->write($output);
}
}
$output->writeListEnd();
@@ -1708,13 +1821,13 @@ class ComputeResourceDescription {
if (!is_array($this->dataMovemenetInterfaces)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataMovemenetInterfaces', TType::LST, 11);
+ $xfer += $output->writeFieldBegin('dataMovemenetInterfaces', TType::LST, 10);
{
$output->writeListBegin(TType::STRUCT, count($this->dataMovemenetInterfaces));
{
- foreach ($this->dataMovemenetInterfaces as $iter59)
+ foreach ($this->dataMovemenetInterfaces as $iter68)
{
- $xfer += $iter59->write($output);
+ $xfer += $iter68->write($output);
}
}
$output->writeListEnd();