adding gamess and update airavata data models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/842004ee Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/842004ee Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/842004ee Branch: refs/heads/master Commit: 842004ee48df281bf068e024d8118677bf639bdb Parents: a913610 Author: Chathuri Wimalasena <[email protected]> Authored: Mon Dec 22 16:58:08 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Dec 22 16:58:08 2014 -0500 ---------------------------------------------------------------------- .../applicationInterfaceModel_types.cpp | 90 ++--- .../airavata/applicationInterfaceModel_types.h | 23 +- .../lib/airavata/computeResourceModel_types.cpp | 36 +- .../lib/airavata/computeResourceModel_types.h | 38 ++- .../lib/airavata/experimentModel_types.cpp | 12 +- .../lib/airavata/experimentModel_types.h | 12 +- .../lib/airavata/messagingEvents_types.cpp | 4 +- .../lib/airavata/messagingEvents_types.h | 4 +- .../lib/airavata/workflowDataModel_types.cpp | 4 +- .../lib/airavata/workflowDataModel_types.h | 4 +- .../Model/AppCatalog/AppInterface/Types.php | 28 +- .../Model/AppCatalog/ComputeResource/Types.php | 40 +++ .../tools/RegisterSampleApplications.java | 331 +++++++------------ .../tools/RegisterSampleApplicationsUtils.java | 46 ++- .../appinterface/OutputDataObjectType.java | 141 +++++++- .../appcatalog/computeresource/BatchQueue.java | 102 +++++- .../ComputeResourceDescription.java | 106 +++++- .../applicationInterfaceModel.thrift | 5 +- .../computeResourceModel.thrift | 6 +- .../catalog/data/model/ApplicationOutput.java | 9 + .../resources/ApplicationOutputResource.java | 10 + .../catalog/data/util/AppCatalogJPAUtils.java | 1 + .../data/util/AppCatalogThriftConversion.java | 3 + .../src/main/resources/appcatalog-derby.sql | 1 + .../src/main/resources/appcatalog-mysql.sql | 1 + .../registry/jpa/model/ApplicationOutput.java | 10 + .../registry/jpa/model/Experiment_Output.java | 9 + .../registry/jpa/model/NodeOutput.java | 10 + .../resources/ApplicationOutputResource.java | 11 + .../jpa/resources/ExperimentOutputResource.java | 11 + .../jpa/resources/NodeOutputResource.java | 11 + .../registry/jpa/resources/Utils.java | 3 + .../jpa/utils/ThriftDataModelConversion.java | 9 + .../src/main/resources/registry-derby.sql | 3 + .../src/main/resources/registry-mysql.sql | 3 + 35 files changed, 814 insertions(+), 323 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp index 1b40aa0..50f18a5 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.cpp @@ -286,8 +286,8 @@ void swap(InputDataObjectType &a, InputDataObjectType &b) { swap(a.__isset, b.__isset); } -const char* OutputDataObjectType::ascii_fingerprint = "9B8C3AEA43A2028DF0CEF51E90706E3A"; -const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A}; +const char* OutputDataObjectType::ascii_fingerprint = "C7730F2BFEF5236FD42B9C23095938DB"; +const uint8_t OutputDataObjectType::binary_fingerprint[16] = {0xC7,0x73,0x0F,0x2B,0xFE,0xF5,0x23,0x6F,0xD4,0x2B,0x9C,0x23,0x09,0x59,0x38,0xDB}; uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -347,6 +347,16 @@ uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot } break; case 5: + if (ftype == ::apache::thrift::protocol::T_I32) { + int32_t ecast5; + xfer += iprot->readI32(ecast5); + this->addedToCommandLine = (CommandLineType::type)ecast5; + this->__isset.addedToCommandLine = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 6: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->dataMovement); this->__isset.dataMovement = true; @@ -354,7 +364,7 @@ uint32_t OutputDataObjectType::read(::apache::thrift::protocol::TProtocol* iprot xfer += iprot->skip(ftype); } break; - case 6: + case 7: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->dataNameLocation); this->__isset.dataNameLocation = true; @@ -399,13 +409,18 @@ uint32_t OutputDataObjectType::write(::apache::thrift::protocol::TProtocol* opro xfer += oprot->writeI32((int32_t)this->validityType); xfer += oprot->writeFieldEnd(); } + if (this->__isset.addedToCommandLine) { + xfer += oprot->writeFieldBegin("addedToCommandLine", ::apache::thrift::protocol::T_I32, 5); + xfer += oprot->writeI32((int32_t)this->addedToCommandLine); + xfer += oprot->writeFieldEnd(); + } if (this->__isset.dataMovement) { - xfer += oprot->writeFieldBegin("dataMovement", ::apache::thrift::protocol::T_BOOL, 5); + xfer += oprot->writeFieldBegin("dataMovement", ::apache::thrift::protocol::T_BOOL, 6); xfer += oprot->writeBool(this->dataMovement); xfer += oprot->writeFieldEnd(); } if (this->__isset.dataNameLocation) { - xfer += oprot->writeFieldBegin("dataNameLocation", ::apache::thrift::protocol::T_STRING, 6); + xfer += oprot->writeFieldBegin("dataNameLocation", ::apache::thrift::protocol::T_STRING, 7); xfer += oprot->writeString(this->dataNameLocation); xfer += oprot->writeFieldEnd(); } @@ -420,13 +435,14 @@ void swap(OutputDataObjectType &a, OutputDataObjectType &b) { swap(a.value, b.value); swap(a.type, b.type); swap(a.validityType, b.validityType); + swap(a.addedToCommandLine, b.addedToCommandLine); swap(a.dataMovement, b.dataMovement); swap(a.dataNameLocation, b.dataNameLocation); swap(a.__isset, b.__isset); } -const char* ApplicationInterfaceDescription::ascii_fingerprint = "CE1749A2DE50827990C3136E0CE4B60D"; -const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D}; +const char* ApplicationInterfaceDescription::ascii_fingerprint = "3BB1C87ED8E5FD354E5AE0409D72BE54"; +const uint8_t ApplicationInterfaceDescription::binary_fingerprint[16] = {0x3B,0xB1,0xC8,0x7E,0xD8,0xE5,0xFD,0x35,0x4E,0x5A,0xE0,0x40,0x9D,0x72,0xBE,0x54}; uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -478,14 +494,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationModules.clear(); - uint32_t _size5; - ::apache::thrift::protocol::TType _etype8; - xfer += iprot->readListBegin(_etype8, _size5); - this->applicationModules.resize(_size5); - uint32_t _i9; - for (_i9 = 0; _i9 < _size5; ++_i9) + uint32_t _size6; + ::apache::thrift::protocol::TType _etype9; + xfer += iprot->readListBegin(_etype9, _size6); + this->applicationModules.resize(_size6); + uint32_t _i10; + for (_i10 = 0; _i10 < _size6; ++_i10) { - xfer += iprot->readString(this->applicationModules[_i9]); + xfer += iprot->readString(this->applicationModules[_i10]); } xfer += iprot->readListEnd(); } @@ -498,14 +514,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationInputs.clear(); - uint32_t _size10; - ::apache::thrift::protocol::TType _etype13; - xfer += iprot->readListBegin(_etype13, _size10); - this->applicationInputs.resize(_size10); - uint32_t _i14; - for (_i14 = 0; _i14 < _size10; ++_i14) + uint32_t _size11; + ::apache::thrift::protocol::TType _etype14; + xfer += iprot->readListBegin(_etype14, _size11); + this->applicationInputs.resize(_size11); + uint32_t _i15; + for (_i15 = 0; _i15 < _size11; ++_i15) { - xfer += this->applicationInputs[_i14].read(iprot); + xfer += this->applicationInputs[_i15].read(iprot); } xfer += iprot->readListEnd(); } @@ -518,14 +534,14 @@ uint32_t ApplicationInterfaceDescription::read(::apache::thrift::protocol::TProt if (ftype == ::apache::thrift::protocol::T_LIST) { { this->applicationOutputs.clear(); - uint32_t _size15; - ::apache::thrift::protocol::TType _etype18; - xfer += iprot->readListBegin(_etype18, _size15); - this->applicationOutputs.resize(_size15); - uint32_t _i19; - for (_i19 = 0; _i19 < _size15; ++_i19) + uint32_t _size16; + ::apache::thrift::protocol::TType _etype19; + xfer += iprot->readListBegin(_etype19, _size16); + this->applicationOutputs.resize(_size16); + uint32_t _i20; + for (_i20 = 0; _i20 < _size16; ++_i20) { - xfer += this->applicationOutputs[_i19].read(iprot); + xfer += this->applicationOutputs[_i20].read(iprot); } xfer += iprot->readListEnd(); } @@ -571,10 +587,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro xfer += oprot->writeFieldBegin("applicationModules", ::apache::thrift::protocol::T_LIST, 4); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->applicationModules.size())); - std::vector<std::string> ::const_iterator _iter20; - for (_iter20 = this->applicationModules.begin(); _iter20 != this->applicationModules.end(); ++_iter20) + std::vector<std::string> ::const_iterator _iter21; + for (_iter21 = this->applicationModules.begin(); _iter21 != this->applicationModules.end(); ++_iter21) { - xfer += oprot->writeString((*_iter20)); + xfer += oprot->writeString((*_iter21)); } xfer += oprot->writeListEnd(); } @@ -584,10 +600,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro xfer += oprot->writeFieldBegin("applicationInputs", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationInputs.size())); - std::vector<InputDataObjectType> ::const_iterator _iter21; - for (_iter21 = this->applicationInputs.begin(); _iter21 != this->applicationInputs.end(); ++_iter21) + std::vector<InputDataObjectType> ::const_iterator _iter22; + for (_iter22 = this->applicationInputs.begin(); _iter22 != this->applicationInputs.end(); ++_iter22) { - xfer += (*_iter21).write(oprot); + xfer += (*_iter22).write(oprot); } xfer += oprot->writeListEnd(); } @@ -597,10 +613,10 @@ uint32_t ApplicationInterfaceDescription::write(::apache::thrift::protocol::TPro xfer += oprot->writeFieldBegin("applicationOutputs", ::apache::thrift::protocol::T_LIST, 6); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationOutputs.size())); - std::vector<OutputDataObjectType> ::const_iterator _iter22; - for (_iter22 = this->applicationOutputs.begin(); _iter22 != this->applicationOutputs.end(); ++_iter22) + std::vector<OutputDataObjectType> ::const_iterator _iter23; + for (_iter23 = this->applicationOutputs.begin(); _iter23 != this->applicationOutputs.end(); ++_iter23) { - xfer += (*_iter22).write(oprot); + xfer += (*_iter23).write(oprot); } xfer += oprot->writeListEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h index 7a7ab52..38a6f32 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/applicationInterfaceModel_types.h @@ -227,10 +227,11 @@ class InputDataObjectType { void swap(InputDataObjectType &a, InputDataObjectType &b); typedef struct _OutputDataObjectType__isset { - _OutputDataObjectType__isset() : value(false), type(false), validityType(false), dataMovement(false), dataNameLocation(false) {} + _OutputDataObjectType__isset() : value(false), type(false), validityType(false), addedToCommandLine(false), dataMovement(false), dataNameLocation(false) {} bool value; bool type; bool validityType; + bool addedToCommandLine; bool dataMovement; bool dataNameLocation; } _OutputDataObjectType__isset; @@ -238,10 +239,10 @@ typedef struct _OutputDataObjectType__isset { class OutputDataObjectType { public: - static const char* ascii_fingerprint; // = "9B8C3AEA43A2028DF0CEF51E90706E3A"; - static const uint8_t binary_fingerprint[16]; // = {0x9B,0x8C,0x3A,0xEA,0x43,0xA2,0x02,0x8D,0xF0,0xCE,0xF5,0x1E,0x90,0x70,0x6E,0x3A}; + static const char* ascii_fingerprint; // = "C7730F2BFEF5236FD42B9C23095938DB"; + static const uint8_t binary_fingerprint[16]; // = {0xC7,0x73,0x0F,0x2B,0xFE,0xF5,0x23,0x6F,0xD4,0x2B,0x9C,0x23,0x09,0x59,0x38,0xDB}; - OutputDataObjectType() : name(), value(), type((DataType::type)0), validityType((ValidityType::type)0), dataMovement(0), dataNameLocation() { + OutputDataObjectType() : name(), value(), type((DataType::type)0), validityType((ValidityType::type)0), addedToCommandLine((CommandLineType::type)0), dataMovement(0), dataNameLocation() { } virtual ~OutputDataObjectType() throw() {} @@ -250,6 +251,7 @@ class OutputDataObjectType { std::string value; DataType::type type; ValidityType::type validityType; + CommandLineType::type addedToCommandLine; bool dataMovement; std::string dataNameLocation; @@ -274,6 +276,11 @@ class OutputDataObjectType { __isset.validityType = true; } + void __set_addedToCommandLine(const CommandLineType::type val) { + addedToCommandLine = val; + __isset.addedToCommandLine = true; + } + void __set_dataMovement(const bool val) { dataMovement = val; __isset.dataMovement = true; @@ -300,6 +307,10 @@ class OutputDataObjectType { return false; else if (__isset.validityType && !(validityType == rhs.validityType)) return false; + if (__isset.addedToCommandLine != rhs.__isset.addedToCommandLine) + return false; + else if (__isset.addedToCommandLine && !(addedToCommandLine == rhs.addedToCommandLine)) + return false; if (__isset.dataMovement != rhs.__isset.dataMovement) return false; else if (__isset.dataMovement && !(dataMovement == rhs.dataMovement)) @@ -334,8 +345,8 @@ typedef struct _ApplicationInterfaceDescription__isset { class ApplicationInterfaceDescription { public: - static const char* ascii_fingerprint; // = "CE1749A2DE50827990C3136E0CE4B60D"; - static const uint8_t binary_fingerprint[16]; // = {0xCE,0x17,0x49,0xA2,0xDE,0x50,0x82,0x79,0x90,0xC3,0x13,0x6E,0x0C,0xE4,0xB6,0x0D}; + static const char* ascii_fingerprint; // = "3BB1C87ED8E5FD354E5AE0409D72BE54"; + static const uint8_t binary_fingerprint[16]; // = {0x3B,0xB1,0xC8,0x7E,0xD8,0xE5,0xFD,0x35,0x4E,0x5A,0xE0,0x40,0x9D,0x72,0xBE,0x54}; ApplicationInterfaceDescription() : applicationInterfaceId("DO_NOT_SET_AT_CLIENTS"), applicationName(), applicationDescription() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp index 25c7bf1..b202d83 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp @@ -298,8 +298,8 @@ void swap(ResourceJobManager &a, ResourceJobManager &b) { 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}; +const char* BatchQueue::ascii_fingerprint = "ED0A78585E8BA402743AC1D5D510EF9E"; +const uint8_t BatchQueue::binary_fingerprint[16] = {0xED,0x0A,0x78,0x58,0x5E,0x8B,0xA4,0x02,0x74,0x3A,0xC1,0xD5,0xD5,0x10,0xEF,0x9E}; uint32_t BatchQueue::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -370,6 +370,14 @@ uint32_t BatchQueue::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; + case 7: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->maxMemory); + this->__isset.maxMemory = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -417,6 +425,11 @@ uint32_t BatchQueue::write(::apache::thrift::protocol::TProtocol* oprot) const { xfer += oprot->writeI32(this->maxJobsInQueue); xfer += oprot->writeFieldEnd(); } + if (this->__isset.maxMemory) { + xfer += oprot->writeFieldBegin("maxMemory", ::apache::thrift::protocol::T_I32, 7); + xfer += oprot->writeI32(this->maxMemory); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -430,6 +443,7 @@ void swap(BatchQueue &a, BatchQueue &b) { swap(a.maxNodes, b.maxNodes); swap(a.maxProcessors, b.maxProcessors); swap(a.maxJobsInQueue, b.maxJobsInQueue); + swap(a.maxMemory, b.maxMemory); swap(a.__isset, b.__isset); } @@ -1606,8 +1620,8 @@ void swap(DataMovementInterface &a, DataMovementInterface &b) { swap(a.priorityOrder, b.priorityOrder); } -const char* ComputeResourceDescription::ascii_fingerprint = "CA924FC1A07D7956848B049D2CACF3EC"; -const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0xCA,0x92,0x4F,0xC1,0xA0,0x7D,0x79,0x56,0x84,0x8B,0x04,0x9D,0x2C,0xAC,0xF3,0xEC}; +const char* ComputeResourceDescription::ascii_fingerprint = "3CD4212965217787DCD6081F1744069F"; +const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0x3C,0xD4,0x21,0x29,0x65,0x21,0x77,0x87,0xDC,0xD6,0x08,0x1F,0x17,0x44,0x06,0x9F}; uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -1780,6 +1794,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; + case 10: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->maxMemoryPerNode); + this->__isset.maxMemoryPerNode = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -1892,6 +1914,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol } xfer += oprot->writeFieldEnd(); } + if (this->__isset.maxMemoryPerNode) { + xfer += oprot->writeFieldBegin("maxMemoryPerNode", ::apache::thrift::protocol::T_I32, 10); + xfer += oprot->writeI32(this->maxMemoryPerNode); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -1908,6 +1935,7 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) { swap(a.fileSystems, b.fileSystems); swap(a.jobSubmissionInterfaces, b.jobSubmissionInterfaces); swap(a.dataMovementInterfaces, b.dataMovementInterfaces); + swap(a.maxMemoryPerNode, b.maxMemoryPerNode); swap(a.__isset, b.__isset); } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h index 582b2d1..f6f0298 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h @@ -209,21 +209,22 @@ class ResourceJobManager { void swap(ResourceJobManager &a, ResourceJobManager &b); typedef struct _BatchQueue__isset { - _BatchQueue__isset() : queueDescription(false), maxRunTime(false), maxNodes(false), maxProcessors(false), maxJobsInQueue(false) {} + _BatchQueue__isset() : queueDescription(false), maxRunTime(false), maxNodes(false), maxProcessors(false), maxJobsInQueue(false), maxMemory(false) {} bool queueDescription; bool maxRunTime; bool maxNodes; bool maxProcessors; bool maxJobsInQueue; + bool maxMemory; } _BatchQueue__isset; class BatchQueue { public: - static const char* ascii_fingerprint; // = "DA59FF8EE453E1822971C1CE1471EEA1"; - static const uint8_t binary_fingerprint[16]; // = {0xDA,0x59,0xFF,0x8E,0xE4,0x53,0xE1,0x82,0x29,0x71,0xC1,0xCE,0x14,0x71,0xEE,0xA1}; + static const char* ascii_fingerprint; // = "ED0A78585E8BA402743AC1D5D510EF9E"; + static const uint8_t binary_fingerprint[16]; // = {0xED,0x0A,0x78,0x58,0x5E,0x8B,0xA4,0x02,0x74,0x3A,0xC1,0xD5,0xD5,0x10,0xEF,0x9E}; - BatchQueue() : queueName(), queueDescription(), maxRunTime(0), maxNodes(0), maxProcessors(0), maxJobsInQueue(0) { + BatchQueue() : queueName(), queueDescription(), maxRunTime(0), maxNodes(0), maxProcessors(0), maxJobsInQueue(0), maxMemory(0) { } virtual ~BatchQueue() throw() {} @@ -234,6 +235,7 @@ class BatchQueue { int32_t maxNodes; int32_t maxProcessors; int32_t maxJobsInQueue; + int32_t maxMemory; _BatchQueue__isset __isset; @@ -266,6 +268,11 @@ class BatchQueue { __isset.maxJobsInQueue = true; } + void __set_maxMemory(const int32_t val) { + maxMemory = val; + __isset.maxMemory = true; + } + bool operator == (const BatchQueue & rhs) const { if (!(queueName == rhs.queueName)) @@ -290,6 +297,10 @@ class BatchQueue { return false; else if (__isset.maxJobsInQueue && !(maxJobsInQueue == rhs.maxJobsInQueue)) return false; + if (__isset.maxMemory != rhs.__isset.maxMemory) + return false; + else if (__isset.maxMemory && !(maxMemory == rhs.maxMemory)) + return false; return true; } bool operator != (const BatchQueue &rhs) const { @@ -934,7 +945,7 @@ class DataMovementInterface { void swap(DataMovementInterface &a, DataMovementInterface &b); typedef struct _ComputeResourceDescription__isset { - _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false) {} + _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false) {} bool hostAliases; bool ipAddresses; bool resourceDescription; @@ -942,15 +953,16 @@ typedef struct _ComputeResourceDescription__isset { bool fileSystems; bool jobSubmissionInterfaces; bool dataMovementInterfaces; + bool maxMemoryPerNode; } _ComputeResourceDescription__isset; class ComputeResourceDescription { public: - static const char* ascii_fingerprint; // = "CA924FC1A07D7956848B049D2CACF3EC"; - static const uint8_t binary_fingerprint[16]; // = {0xCA,0x92,0x4F,0xC1,0xA0,0x7D,0x79,0x56,0x84,0x8B,0x04,0x9D,0x2C,0xAC,0xF3,0xEC}; + static const char* ascii_fingerprint; // = "3CD4212965217787DCD6081F1744069F"; + static const uint8_t binary_fingerprint[16]; // = {0x3C,0xD4,0x21,0x29,0x65,0x21,0x77,0x87,0xDC,0xD6,0x08,0x1F,0x17,0x44,0x06,0x9F}; - ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription() { + ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), maxMemoryPerNode(0) { } virtual ~ComputeResourceDescription() throw() {} @@ -964,6 +976,7 @@ class ComputeResourceDescription { std::map<FileSystems::type, std::string> fileSystems; std::vector<JobSubmissionInterface> jobSubmissionInterfaces; std::vector<DataMovementInterface> dataMovementInterfaces; + int32_t maxMemoryPerNode; _ComputeResourceDescription__isset __isset; @@ -1010,6 +1023,11 @@ class ComputeResourceDescription { __isset.dataMovementInterfaces = true; } + void __set_maxMemoryPerNode(const int32_t val) { + maxMemoryPerNode = val; + __isset.maxMemoryPerNode = true; + } + bool operator == (const ComputeResourceDescription & rhs) const { if (!(computeResourceId == rhs.computeResourceId)) @@ -1044,6 +1062,10 @@ class ComputeResourceDescription { return false; else if (__isset.dataMovementInterfaces && !(dataMovementInterfaces == rhs.dataMovementInterfaces)) return false; + if (__isset.maxMemoryPerNode != rhs.__isset.maxMemoryPerNode) + return false; + else if (__isset.maxMemoryPerNode && !(maxMemoryPerNode == rhs.maxMemoryPerNode)) + return false; return true; } bool operator != (const ComputeResourceDescription &rhs) const { http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp index 0d92089..af464cd 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.cpp @@ -1843,8 +1843,8 @@ void swap(DataTransferDetails &a, DataTransferDetails &b) { swap(a.__isset, b.__isset); } -const char* TaskDetails::ascii_fingerprint = "09A94E3E2FA720626BDA3CA7ADC1CB70"; -const uint8_t TaskDetails::binary_fingerprint[16] = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70}; +const char* TaskDetails::ascii_fingerprint = "929162F2CFE206BC896243F516266754"; +const uint8_t TaskDetails::binary_fingerprint[16] = {0x92,0x91,0x62,0xF2,0xCF,0xE2,0x06,0xBC,0x89,0x62,0x43,0xF5,0x16,0x26,0x67,0x54}; uint32_t TaskDetails::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -2190,8 +2190,8 @@ void swap(TaskDetails &a, TaskDetails &b) { swap(a.__isset, b.__isset); } -const char* WorkflowNodeDetails::ascii_fingerprint = "851CFB79378E39B6C03385F9272B8A93"; -const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93}; +const char* WorkflowNodeDetails::ascii_fingerprint = "770C73AD302F29182AA4C501D39E8ADF"; +const uint8_t WorkflowNodeDetails::binary_fingerprint[16] = {0x77,0x0C,0x73,0xAD,0x30,0x2F,0x29,0x18,0x2A,0xA4,0xC5,0x01,0xD3,0x9E,0x8A,0xDF}; uint32_t WorkflowNodeDetails::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -2646,8 +2646,8 @@ void swap(ValidationResults &a, ValidationResults &b) { swap(a.validationResultList, b.validationResultList); } -const char* Experiment::ascii_fingerprint = "1390A2E18FD8CF984CDDD4E167ED1E67"; -const uint8_t Experiment::binary_fingerprint[16] = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67}; +const char* Experiment::ascii_fingerprint = "B144E8C411770A1464B18D645C8E31EA"; +const uint8_t Experiment::binary_fingerprint[16] = {0xB1,0x44,0xE8,0xC4,0x11,0x77,0x0A,0x14,0x64,0xB1,0x8D,0x64,0x5C,0x8E,0x31,0xEA}; uint32_t Experiment::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h index 80701b5..8ae102b 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experimentModel_types.h @@ -1294,8 +1294,8 @@ typedef struct _TaskDetails__isset { class TaskDetails { public: - static const char* ascii_fingerprint; // = "09A94E3E2FA720626BDA3CA7ADC1CB70"; - static const uint8_t binary_fingerprint[16]; // = {0x09,0xA9,0x4E,0x3E,0x2F,0xA7,0x20,0x62,0x6B,0xDA,0x3C,0xA7,0xAD,0xC1,0xCB,0x70}; + static const char* ascii_fingerprint; // = "929162F2CFE206BC896243F516266754"; + static const uint8_t binary_fingerprint[16]; // = {0x92,0x91,0x62,0xF2,0xCF,0xE2,0x06,0xBC,0x89,0x62,0x43,0xF5,0x16,0x26,0x67,0x54}; TaskDetails() : taskID("DO_NOT_SET_AT_CLIENTS"), creationTime(0), applicationId(), applicationVersion(), applicationDeploymentId() { } @@ -1473,8 +1473,8 @@ typedef struct _WorkflowNodeDetails__isset { class WorkflowNodeDetails { public: - static const char* ascii_fingerprint; // = "851CFB79378E39B6C03385F9272B8A93"; - static const uint8_t binary_fingerprint[16]; // = {0x85,0x1C,0xFB,0x79,0x37,0x8E,0x39,0xB6,0xC0,0x33,0x85,0xF9,0x27,0x2B,0x8A,0x93}; + static const char* ascii_fingerprint; // = "770C73AD302F29182AA4C501D39E8ADF"; + static const uint8_t binary_fingerprint[16]; // = {0x77,0x0C,0x73,0xAD,0x30,0x2F,0x29,0x18,0x2A,0xA4,0xC5,0x01,0xD3,0x9E,0x8A,0xDF}; WorkflowNodeDetails() : nodeInstanceId("DO_NOT_SET_AT_CLIENTS"), creationTime(0), nodeName("SINGLE_APP_NODE"), executionUnit((ExecutionUnit::type)1), executionUnitData() { executionUnit = (ExecutionUnit::type)1; @@ -1712,8 +1712,8 @@ typedef struct _Experiment__isset { class Experiment { public: - static const char* ascii_fingerprint; // = "1390A2E18FD8CF984CDDD4E167ED1E67"; - static const uint8_t binary_fingerprint[16]; // = {0x13,0x90,0xA2,0xE1,0x8F,0xD8,0xCF,0x98,0x4C,0xDD,0xD4,0xE1,0x67,0xED,0x1E,0x67}; + static const char* ascii_fingerprint; // = "B144E8C411770A1464B18D645C8E31EA"; + static const uint8_t binary_fingerprint[16]; // = {0xB1,0x44,0xE8,0xC4,0x11,0x77,0x0A,0x14,0x64,0xB1,0x8D,0x64,0x5C,0x8E,0x31,0xEA}; Experiment() : experimentID("DO_NOT_SET_AT_CLIENTS"), projectID("DEFAULT"), creationTime(0), userName(), name(), description(), applicationId(), applicationVersion(), workflowTemplateId(), workflowTemplateVersion(), workflowExecutionInstanceId() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp index 2297e40..b5847ba 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.cpp @@ -607,8 +607,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b) { swap(a.taskIdentity, b.taskIdentity); } -const char* TaskOutputChangeEvent::ascii_fingerprint = "CD10AFEB7332120253CE0C3FFCF54C48"; -const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48}; +const char* TaskOutputChangeEvent::ascii_fingerprint = "DF5358F559BF0C15E8D7E438A1483AEA"; +const uint8_t TaskOutputChangeEvent::binary_fingerprint[16] = {0xDF,0x53,0x58,0xF5,0x59,0xBF,0x0C,0x15,0xE8,0xD7,0xE4,0x38,0xA1,0x48,0x3A,0xEA}; uint32_t TaskOutputChangeEvent::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h index 3596539..f96e816 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/messagingEvents_types.h @@ -354,8 +354,8 @@ void swap(TaskStatusChangeRequestEvent &a, TaskStatusChangeRequestEvent &b); class TaskOutputChangeEvent { public: - static const char* ascii_fingerprint; // = "CD10AFEB7332120253CE0C3FFCF54C48"; - static const uint8_t binary_fingerprint[16]; // = {0xCD,0x10,0xAF,0xEB,0x73,0x32,0x12,0x02,0x53,0xCE,0x0C,0x3F,0xFC,0xF5,0x4C,0x48}; + static const char* ascii_fingerprint; // = "DF5358F559BF0C15E8D7E438A1483AEA"; + static const uint8_t binary_fingerprint[16]; // = {0xDF,0x53,0x58,0xF5,0x59,0xBF,0x0C,0x15,0xE8,0xD7,0xE4,0x38,0xA1,0x48,0x3A,0xEA}; TaskOutputChangeEvent() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp index cffa250..fb7f03d 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.cpp @@ -27,8 +27,8 @@ -const char* Workflow::ascii_fingerprint = "4320FCC5DE6949377139919B68E7F5C1"; -const uint8_t Workflow::binary_fingerprint[16] = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1}; +const char* Workflow::ascii_fingerprint = "0D4C41C8B641E56997DDA4AF85668A2D"; +const uint8_t Workflow::binary_fingerprint[16] = {0x0D,0x4C,0x41,0xC8,0xB6,0x41,0xE5,0x69,0x97,0xDD,0xA4,0xAF,0x85,0x66,0x8A,0x2D}; uint32_t Workflow::read(::apache::thrift::protocol::TProtocol* iprot) { http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h index b46858d..bfe0f35 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workflowDataModel_types.h @@ -46,8 +46,8 @@ typedef struct _Workflow__isset { class Workflow { public: - static const char* ascii_fingerprint; // = "4320FCC5DE6949377139919B68E7F5C1"; - static const uint8_t binary_fingerprint[16]; // = {0x43,0x20,0xFC,0xC5,0xDE,0x69,0x49,0x37,0x71,0x39,0x91,0x9B,0x68,0xE7,0xF5,0xC1}; + static const char* ascii_fingerprint; // = "0D4C41C8B641E56997DDA4AF85668A2D"; + static const uint8_t binary_fingerprint[16]; // = {0x0D,0x4C,0x41,0xC8,0xB6,0x41,0xE5,0x69,0x97,0xDD,0xA4,0xAF,0x85,0x66,0x8A,0x2D}; Workflow() : templateId("DO_NOT_SET_AT_CLIENTS"), name(), graph(), image() { } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php index 4983eb2..026550d 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php @@ -340,6 +340,7 @@ class OutputDataObjectType { public $value = null; public $type = null; public $validityType = null; + public $addedToCommandLine = null; public $dataMovement = null; public $dataNameLocation = null; @@ -363,10 +364,14 @@ class OutputDataObjectType { 'type' => TType::I32, ), 5 => array( + 'var' => 'addedToCommandLine', + 'type' => TType::I32, + ), + 6 => array( 'var' => 'dataMovement', 'type' => TType::BOOL, ), - 6 => array( + 7 => array( 'var' => 'dataNameLocation', 'type' => TType::STRING, ), @@ -385,6 +390,9 @@ class OutputDataObjectType { if (isset($vals['validityType'])) { $this->validityType = $vals['validityType']; } + if (isset($vals['addedToCommandLine'])) { + $this->addedToCommandLine = $vals['addedToCommandLine']; + } if (isset($vals['dataMovement'])) { $this->dataMovement = $vals['dataMovement']; } @@ -442,13 +450,20 @@ class OutputDataObjectType { } break; case 5: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->addedToCommandLine); + } else { + $xfer += $input->skip($ftype); + } + break; + case 6: if ($ftype == TType::BOOL) { $xfer += $input->readBool($this->dataMovement); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->dataNameLocation); } else { @@ -488,13 +503,18 @@ class OutputDataObjectType { $xfer += $output->writeI32($this->validityType); $xfer += $output->writeFieldEnd(); } + if ($this->addedToCommandLine !== null) { + $xfer += $output->writeFieldBegin('addedToCommandLine', TType::I32, 5); + $xfer += $output->writeI32($this->addedToCommandLine); + $xfer += $output->writeFieldEnd(); + } if ($this->dataMovement !== null) { - $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 5); + $xfer += $output->writeFieldBegin('dataMovement', TType::BOOL, 6); $xfer += $output->writeBool($this->dataMovement); $xfer += $output->writeFieldEnd(); } if ($this->dataNameLocation !== null) { - $xfer += $output->writeFieldBegin('dataNameLocation', TType::STRING, 6); + $xfer += $output->writeFieldBegin('dataNameLocation', TType::STRING, 7); $xfer += $output->writeString($this->dataNameLocation); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/842004ee/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 9623821..fbc66ab 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 @@ -324,6 +324,7 @@ class BatchQueue { public $maxNodes = null; public $maxProcessors = null; public $maxJobsInQueue = null; + public $maxMemory = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -352,6 +353,10 @@ class BatchQueue { 'var' => 'maxJobsInQueue', 'type' => TType::I32, ), + 7 => array( + 'var' => 'maxMemory', + 'type' => TType::I32, + ), ); } if (is_array($vals)) { @@ -373,6 +378,9 @@ class BatchQueue { if (isset($vals['maxJobsInQueue'])) { $this->maxJobsInQueue = $vals['maxJobsInQueue']; } + if (isset($vals['maxMemory'])) { + $this->maxMemory = $vals['maxMemory']; + } } } @@ -437,6 +445,13 @@ class BatchQueue { $xfer += $input->skip($ftype); } break; + case 7: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->maxMemory); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -480,6 +495,11 @@ class BatchQueue { $xfer += $output->writeI32($this->maxJobsInQueue); $xfer += $output->writeFieldEnd(); } + if ($this->maxMemory !== null) { + $xfer += $output->writeFieldBegin('maxMemory', TType::I32, 7); + $xfer += $output->writeI32($this->maxMemory); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -1873,6 +1893,7 @@ class ComputeResourceDescription { public $fileSystems = null; public $jobSubmissionInterfaces = null; public $dataMovementInterfaces = null; + public $maxMemoryPerNode = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -1944,6 +1965,10 @@ class ComputeResourceDescription { 'class' => '\Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface', ), ), + 10 => array( + 'var' => 'maxMemoryPerNode', + 'type' => TType::I32, + ), ); } if (is_array($vals)) { @@ -1974,6 +1999,9 @@ class ComputeResourceDescription { if (isset($vals['dataMovementInterfaces'])) { $this->dataMovementInterfaces = $vals['dataMovementInterfaces']; } + if (isset($vals['maxMemoryPerNode'])) { + $this->maxMemoryPerNode = $vals['maxMemoryPerNode']; + } } } @@ -2125,6 +2153,13 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; + case 10: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->maxMemoryPerNode); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -2256,6 +2291,11 @@ class ComputeResourceDescription { } $xfer += $output->writeFieldEnd(); } + if ($this->maxMemoryPerNode !== null) { + $xfer += $output->writeFieldBegin('maxMemoryPerNode', TType::I32, 10); + $xfer += $output->writeI32($this->maxMemoryPerNode); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer;
