Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2FEEB200C7F for ; Wed, 24 May 2017 23:34:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2E816160BA5; Wed, 24 May 2017 21:34:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3134C160BF7 for ; Wed, 24 May 2017 23:34:17 +0200 (CEST) Received: (qmail 91231 invoked by uid 500); 24 May 2017 21:34:15 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 88181 invoked by uid 99); 24 May 2017 21:34:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2017 21:34:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A0CA5F219F; Wed, 24 May 2017 21:34:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Wed, 24 May 2017 21:34:53 -0000 Message-Id: In-Reply-To: <0c70da5d11144474a0b0d30c186b3100@git.apache.org> References: <0c70da5d11144474a0b0d30c186b3100@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/61] [abbrv] airavata git commit: making database level changes for supporting custom node/cpu/walltime configurations archived-at: Wed, 24 May 2017 21:34:21 -0000 making database level changes for supporting custom node/cpu/walltime configurations Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/56bc4bee Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/56bc4bee Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/56bc4bee Branch: refs/heads/master Commit: 56bc4bee230fb3ba84d26d8965190c5ecfe1c66f Parents: 58ea1bf Author: scnakandala Authored: Mon May 15 01:31:44 2017 -0400 Committer: scnakandala Committed: Mon May 15 01:31:44 2017 -0400 ---------------------------------------------------------------------- .../main/resources/lib/airavata/Airavata.cpp | 582 +------------------ .../src/main/resources/lib/airavata/Airavata.h | 192 +----- .../lib/airavata/Airavata_server.skeleton.cpp | 7 +- .../application_deployment_model_types.cpp | 24 +- .../application_deployment_model_types.h | 12 +- .../airavata/compute_resource_model_types.cpp | 88 +++ .../lib/airavata/compute_resource_model_types.h | 36 +- .../lib/airavata/user_profile_model_types.cpp | 80 +-- .../lib/airavata/user_profile_model_types.h | 12 +- .../resources/lib/Airavata/API/Airavata.php | 466 +-------------- .../Model/AppCatalog/AppDeployment/Types.php | 25 +- .../Model/AppCatalog/ComputeResource/Types.php | 92 +++ .../resources/lib/Airavata/Model/User/Types.php | 109 ++-- .../src/main/resources/lib/Types.php | 13 + .../lib/apache/airavata/api/Airavata-remote | 9 +- .../lib/apache/airavata/api/Airavata.py | 341 +---------- .../model/appcatalog/appdeployment/ttypes.py | 19 +- .../model/appcatalog/computeresource/ttypes.py | 54 +- .../lib/apache/airavata/model/user/ttypes.py | 103 ++-- .../ApplicationDeploymentDescription.java | 117 +++- .../ComputeResourceDescription.java | 404 ++++++++++++- .../catalog/model/ApplicationDeployment.java | 10 + .../core/app/catalog/model/ComputeResource.java | 44 ++ .../resources/AppDeploymentResource.java | 11 + .../resources/ComputeResourceResource.java | 42 +- .../src/main/resources/appcatalog-derby.sql | 5 + .../src/main/resources/appcatalog-mysql.sql | 5 + .../application_deployment_model.thrift | 3 +- .../compute_resource_model.thrift | 6 +- 29 files changed, 1169 insertions(+), 1742 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp index 9e1f1da..32c0d51 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp @@ -54404,314 +54404,6 @@ uint32_t Airavata_getAllUserProfilesInGateway_presult::read(::apache::thrift::pr } -Airavata_getUserProfileByName_args::~Airavata_getUserProfileByName_args() throw() { -} - - -uint32_t Airavata_getUserProfileByName_args::read(::apache::thrift::protocol::TProtocol* iprot) { - - apache::thrift::protocol::TInputRecursionTracker tracker(*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_authzToken = false; - bool isset_userName = false; - bool isset_gatewayId = 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_STRUCT) { - xfer += this->authzToken.read(iprot); - isset_authzToken = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 2: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->userName); - isset_userName = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 3: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->gatewayId); - isset_gatewayId = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } - xfer += iprot->readFieldEnd(); - } - - xfer += iprot->readStructEnd(); - - if (!isset_authzToken) - throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_userName) - throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_gatewayId) - throw TProtocolException(TProtocolException::INVALID_DATA); - return xfer; -} - -uint32_t Airavata_getUserProfileByName_args::write(::apache::thrift::protocol::TProtocol* oprot) const { - uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_args"); - - xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); - xfer += this->authzToken.write(oprot); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString(this->userName); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3); - xfer += oprot->writeString(this->gatewayId); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldStop(); - xfer += oprot->writeStructEnd(); - return xfer; -} - - -Airavata_getUserProfileByName_pargs::~Airavata_getUserProfileByName_pargs() throw() { -} - - -uint32_t Airavata_getUserProfileByName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const { - uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_pargs"); - - xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1); - xfer += (*(this->authzToken)).write(oprot); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString((*(this->userName))); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3); - xfer += oprot->writeString((*(this->gatewayId))); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldStop(); - xfer += oprot->writeStructEnd(); - return xfer; -} - - -Airavata_getUserProfileByName_result::~Airavata_getUserProfileByName_result() throw() { -} - - -uint32_t Airavata_getUserProfileByName_result::read(::apache::thrift::protocol::TProtocol* iprot) { - - apache::thrift::protocol::TInputRecursionTracker tracker(*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; - - - while (true) - { - xfer += iprot->readFieldBegin(fname, ftype, fid); - if (ftype == ::apache::thrift::protocol::T_STOP) { - break; - } - switch (fid) - { - case 0: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->success.read(iprot); - this->__isset.success = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 1: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ire.read(iprot); - this->__isset.ire = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 2: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ace.read(iprot); - this->__isset.ace = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 3: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ase.read(iprot); - this->__isset.ase = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ae.read(iprot); - this->__isset.ae = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } - xfer += iprot->readFieldEnd(); - } - - xfer += iprot->readStructEnd(); - - return xfer; -} - -uint32_t Airavata_getUserProfileByName_result::write(::apache::thrift::protocol::TProtocol* oprot) const { - - uint32_t xfer = 0; - - xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_result"); - - if (this->__isset.success) { - xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0); - xfer += this->success.write(oprot); - xfer += oprot->writeFieldEnd(); - } else if (this->__isset.ire) { - xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1); - xfer += this->ire.write(oprot); - xfer += oprot->writeFieldEnd(); - } else if (this->__isset.ace) { - xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2); - xfer += this->ace.write(oprot); - xfer += oprot->writeFieldEnd(); - } else if (this->__isset.ase) { - xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3); - xfer += this->ase.write(oprot); - xfer += oprot->writeFieldEnd(); - } else if (this->__isset.ae) { - xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4); - xfer += this->ae.write(oprot); - xfer += oprot->writeFieldEnd(); - } - xfer += oprot->writeFieldStop(); - xfer += oprot->writeStructEnd(); - return xfer; -} - - -Airavata_getUserProfileByName_presult::~Airavata_getUserProfileByName_presult() throw() { -} - - -uint32_t Airavata_getUserProfileByName_presult::read(::apache::thrift::protocol::TProtocol* iprot) { - - apache::thrift::protocol::TInputRecursionTracker tracker(*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; - - - while (true) - { - xfer += iprot->readFieldBegin(fname, ftype, fid); - if (ftype == ::apache::thrift::protocol::T_STOP) { - break; - } - switch (fid) - { - case 0: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += (*(this->success)).read(iprot); - this->__isset.success = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 1: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ire.read(iprot); - this->__isset.ire = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 2: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ace.read(iprot); - this->__isset.ace = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 3: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ase.read(iprot); - this->__isset.ase = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 4: - if (ftype == ::apache::thrift::protocol::T_STRUCT) { - xfer += this->ae.read(iprot); - this->__isset.ae = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } - xfer += iprot->readFieldEnd(); - } - - xfer += iprot->readStructEnd(); - - return xfer; -} - - Airavata_doesUserProfileExist_args::~Airavata_doesUserProfileExist_args() throw() { } @@ -54729,7 +54421,7 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP using ::apache::thrift::protocol::TProtocolException; bool isset_authzToken = false; - bool isset_userName = false; + bool isset_userId = false; bool isset_gatewayId = false; while (true) @@ -54750,8 +54442,8 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP break; case 2: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->userName); - isset_userName = true; + xfer += iprot->readString(this->userId); + isset_userId = true; } else { xfer += iprot->skip(ftype); } @@ -54775,7 +54467,7 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP if (!isset_authzToken) throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_userName) + if (!isset_userId) throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_gatewayId) throw TProtocolException(TProtocolException::INVALID_DATA); @@ -54791,8 +54483,8 @@ uint32_t Airavata_doesUserProfileExist_args::write(::apache::thrift::protocol::T xfer += this->authzToken.write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString(this->userName); + xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->userId); xfer += oprot->writeFieldEnd(); xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3); @@ -54818,8 +54510,8 @@ uint32_t Airavata_doesUserProfileExist_pargs::write(::apache::thrift::protocol:: xfer += (*(this->authzToken)).write(oprot); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString((*(this->userName))); + xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString((*(this->userId))); xfer += oprot->writeFieldEnd(); xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3); @@ -67491,92 +67183,20 @@ void AiravataClient::recv_getAllUserProfilesInGateway(std::vector< ::apache::air throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUserProfilesInGateway failed: unknown result"); } -void AiravataClient::getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) -{ - send_getUserProfileByName(authzToken, userName, gatewayId); - recv_getUserProfileByName(_return); -} - -void AiravataClient::send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) -{ - int32_t cseqid = 0; - oprot_->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_CALL, cseqid); - - Airavata_getUserProfileByName_pargs args; - args.authzToken = &authzToken; - args.userName = &userName; - args.gatewayId = &gatewayId; - args.write(oprot_); - - oprot_->writeMessageEnd(); - oprot_->getTransport()->writeEnd(); - oprot_->getTransport()->flush(); -} - -void AiravataClient::recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return) +bool AiravataClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { - - int32_t rseqid = 0; - std::string fname; - ::apache::thrift::protocol::TMessageType mtype; - - iprot_->readMessageBegin(fname, mtype, rseqid); - if (mtype == ::apache::thrift::protocol::T_EXCEPTION) { - ::apache::thrift::TApplicationException x; - x.read(iprot_); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - throw x; - } - if (mtype != ::apache::thrift::protocol::T_REPLY) { - iprot_->skip(::apache::thrift::protocol::T_STRUCT); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - } - if (fname.compare("getUserProfileByName") != 0) { - iprot_->skip(::apache::thrift::protocol::T_STRUCT); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - } - Airavata_getUserProfileByName_presult result; - result.success = &_return; - result.read(iprot_); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - - if (result.__isset.success) { - // _return pointer has now been filled - return; - } - if (result.__isset.ire) { - throw result.ire; - } - if (result.__isset.ace) { - throw result.ace; - } - if (result.__isset.ase) { - throw result.ase; - } - if (result.__isset.ae) { - throw result.ae; - } - throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserProfileByName failed: unknown result"); -} - -bool AiravataClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) -{ - send_doesUserProfileExist(authzToken, userName, gatewayId); + send_doesUserProfileExist(authzToken, userId, gatewayId); return recv_doesUserProfileExist(); } -void AiravataClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) +void AiravataClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { int32_t cseqid = 0; oprot_->writeMessageBegin("doesUserProfileExist", ::apache::thrift::protocol::T_CALL, cseqid); Airavata_doesUserProfileExist_pargs args; args.authzToken = &authzToken; - args.userName = &userName; + args.userId = &userId; args.gatewayId = &gatewayId; args.write(oprot_); @@ -79145,72 +78765,6 @@ void AiravataProcessor::process_getAllUserProfilesInGateway(int32_t seqid, ::apa } } -void AiravataProcessor::process_getUserProfileByName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) -{ - void* ctx = NULL; - if (this->eventHandler_.get() != NULL) { - ctx = this->eventHandler_->getContext("Airavata.getUserProfileByName", callContext); - } - ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getUserProfileByName"); - - if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preRead(ctx, "Airavata.getUserProfileByName"); - } - - Airavata_getUserProfileByName_args args; - args.read(iprot); - iprot->readMessageEnd(); - uint32_t bytes = iprot->getTransport()->readEnd(); - - if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postRead(ctx, "Airavata.getUserProfileByName", bytes); - } - - Airavata_getUserProfileByName_result result; - try { - iface_->getUserProfileByName(result.success, args.authzToken, args.userName, args.gatewayId); - result.__isset.success = true; - } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) { - result.ire = ire; - result.__isset.ire = true; - } catch ( ::apache::airavata::api::error::AiravataClientException &ace) { - result.ace = ace; - result.__isset.ace = true; - } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) { - result.ase = ase; - result.__isset.ase = true; - } catch ( ::apache::airavata::api::error::AuthorizationException &ae) { - result.ae = ae; - result.__isset.ae = true; - } catch (const std::exception& e) { - if (this->eventHandler_.get() != NULL) { - this->eventHandler_->handlerError(ctx, "Airavata.getUserProfileByName"); - } - - ::apache::thrift::TApplicationException x(e.what()); - oprot->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_EXCEPTION, seqid); - x.write(oprot); - oprot->writeMessageEnd(); - oprot->getTransport()->writeEnd(); - oprot->getTransport()->flush(); - return; - } - - if (this->eventHandler_.get() != NULL) { - this->eventHandler_->preWrite(ctx, "Airavata.getUserProfileByName"); - } - - oprot->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_REPLY, seqid); - result.write(oprot); - oprot->writeMessageEnd(); - bytes = oprot->getTransport()->writeEnd(); - oprot->getTransport()->flush(); - - if (this->eventHandler_.get() != NULL) { - this->eventHandler_->postWrite(ctx, "Airavata.getUserProfileByName", bytes); - } -} - void AiravataProcessor::process_doesUserProfileExist(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext) { void* ctx = NULL; @@ -79234,7 +78788,7 @@ void AiravataProcessor::process_doesUserProfileExist(int32_t seqid, ::apache::th Airavata_doesUserProfileExist_result result; try { - result.success = iface_->doesUserProfileExist(args.authzToken, args.userName, args.gatewayId); + result.success = iface_->doesUserProfileExist(args.authzToken, args.userId, args.gatewayId); result.__isset.success = true; } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) { result.ire = ire; @@ -96973,115 +96527,13 @@ void AiravataConcurrentClient::recv_getAllUserProfilesInGateway(std::vector< ::a } // end while(true) } -void AiravataConcurrentClient::getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) -{ - int32_t seqid = send_getUserProfileByName(authzToken, userName, gatewayId); - recv_getUserProfileByName(_return, seqid); -} - -int32_t AiravataConcurrentClient::send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) -{ - int32_t cseqid = this->sync_.generateSeqId(); - ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); - oprot_->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_CALL, cseqid); - - Airavata_getUserProfileByName_pargs args; - args.authzToken = &authzToken; - args.userName = &userName; - args.gatewayId = &gatewayId; - args.write(oprot_); - - oprot_->writeMessageEnd(); - oprot_->getTransport()->writeEnd(); - oprot_->getTransport()->flush(); - - sentry.commit(); - return cseqid; -} - -void AiravataConcurrentClient::recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const int32_t seqid) -{ - - int32_t rseqid = 0; - std::string fname; - ::apache::thrift::protocol::TMessageType mtype; - - // the read mutex gets dropped and reacquired as part of waitForWork() - // The destructor of this sentry wakes up other clients - ::apache::thrift::async::TConcurrentRecvSentry sentry(&this->sync_, seqid); - - while(true) { - if(!this->sync_.getPending(fname, mtype, rseqid)) { - iprot_->readMessageBegin(fname, mtype, rseqid); - } - if(seqid == rseqid) { - if (mtype == ::apache::thrift::protocol::T_EXCEPTION) { - ::apache::thrift::TApplicationException x; - x.read(iprot_); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - sentry.commit(); - throw x; - } - if (mtype != ::apache::thrift::protocol::T_REPLY) { - iprot_->skip(::apache::thrift::protocol::T_STRUCT); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - } - if (fname.compare("getUserProfileByName") != 0) { - iprot_->skip(::apache::thrift::protocol::T_STRUCT); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - - // in a bad state, don't commit - using ::apache::thrift::protocol::TProtocolException; - throw TProtocolException(TProtocolException::INVALID_DATA); - } - Airavata_getUserProfileByName_presult result; - result.success = &_return; - result.read(iprot_); - iprot_->readMessageEnd(); - iprot_->getTransport()->readEnd(); - - if (result.__isset.success) { - // _return pointer has now been filled - sentry.commit(); - return; - } - if (result.__isset.ire) { - sentry.commit(); - throw result.ire; - } - if (result.__isset.ace) { - sentry.commit(); - throw result.ace; - } - if (result.__isset.ase) { - sentry.commit(); - throw result.ase; - } - if (result.__isset.ae) { - sentry.commit(); - throw result.ae; - } - // in a bad state, don't commit - throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserProfileByName failed: unknown result"); - } - // seqid != rseqid - this->sync_.updatePending(fname, mtype, rseqid); - - // this will temporarily unlock the readMutex, and let other clients get work done - this->sync_.waitForWork(seqid); - } // end while(true) -} - -bool AiravataConcurrentClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) +bool AiravataConcurrentClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { - int32_t seqid = send_doesUserProfileExist(authzToken, userName, gatewayId); + int32_t seqid = send_doesUserProfileExist(authzToken, userId, gatewayId); return recv_doesUserProfileExist(seqid); } -int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) +int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { int32_t cseqid = this->sync_.generateSeqId(); ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_); @@ -97089,7 +96541,7 @@ int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::air Airavata_doesUserProfileExist_pargs args; args.authzToken = &authzToken; - args.userName = &userName; + args.userId = &userId; args.gatewayId = &gatewayId; args.write(oprot_); http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h index 1e19e96..7357df3 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h @@ -2978,8 +2978,7 @@ class AiravataIf { virtual void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0; virtual bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId) = 0; virtual void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit) = 0; - virtual void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0; - virtual bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0; + virtual bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0; }; class AiravataIfFactory { @@ -3593,10 +3592,7 @@ class AiravataNull : virtual public AiravataIf { void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const int32_t /* offset */, const int32_t /* limit */) { return; } - void getUserProfileByName( ::apache::airavata::model::user::UserProfile& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) { - return; - } - bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) { + bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userId */, const std::string& /* gatewayId */) { bool _return = false; return _return; } @@ -28171,164 +28167,22 @@ class Airavata_getAllUserProfilesInGateway_presult { }; -class Airavata_getUserProfileByName_args { - public: - - Airavata_getUserProfileByName_args(const Airavata_getUserProfileByName_args&); - Airavata_getUserProfileByName_args& operator=(const Airavata_getUserProfileByName_args&); - Airavata_getUserProfileByName_args() : userName(), gatewayId() { - } - - virtual ~Airavata_getUserProfileByName_args() throw(); - ::apache::airavata::model::security::AuthzToken authzToken; - std::string userName; - std::string gatewayId; - - void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - - void __set_userName(const std::string& val); - - void __set_gatewayId(const std::string& val); - - bool operator == (const Airavata_getUserProfileByName_args & rhs) const - { - if (!(authzToken == rhs.authzToken)) - return false; - if (!(userName == rhs.userName)) - return false; - if (!(gatewayId == rhs.gatewayId)) - return false; - return true; - } - bool operator != (const Airavata_getUserProfileByName_args &rhs) const { - return !(*this == rhs); - } - - bool operator < (const Airavata_getUserProfileByName_args & ) const; - - uint32_t read(::apache::thrift::protocol::TProtocol* iprot); - uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - -}; - - -class Airavata_getUserProfileByName_pargs { - public: - - - virtual ~Airavata_getUserProfileByName_pargs() throw(); - const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* userName; - const std::string* gatewayId; - - uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - -}; - -typedef struct _Airavata_getUserProfileByName_result__isset { - _Airavata_getUserProfileByName_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {} - bool success :1; - bool ire :1; - bool ace :1; - bool ase :1; - bool ae :1; -} _Airavata_getUserProfileByName_result__isset; - -class Airavata_getUserProfileByName_result { - public: - - Airavata_getUserProfileByName_result(const Airavata_getUserProfileByName_result&); - Airavata_getUserProfileByName_result& operator=(const Airavata_getUserProfileByName_result&); - Airavata_getUserProfileByName_result() { - } - - virtual ~Airavata_getUserProfileByName_result() throw(); - ::apache::airavata::model::user::UserProfile success; - ::apache::airavata::api::error::InvalidRequestException ire; - ::apache::airavata::api::error::AiravataClientException ace; - ::apache::airavata::api::error::AiravataSystemException ase; - ::apache::airavata::api::error::AuthorizationException ae; - - _Airavata_getUserProfileByName_result__isset __isset; - - void __set_success(const ::apache::airavata::model::user::UserProfile& val); - - void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val); - - void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val); - - void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val); - - void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val); - - bool operator == (const Airavata_getUserProfileByName_result & rhs) const - { - if (!(success == rhs.success)) - return false; - if (!(ire == rhs.ire)) - return false; - if (!(ace == rhs.ace)) - return false; - if (!(ase == rhs.ase)) - return false; - if (!(ae == rhs.ae)) - return false; - return true; - } - bool operator != (const Airavata_getUserProfileByName_result &rhs) const { - return !(*this == rhs); - } - - bool operator < (const Airavata_getUserProfileByName_result & ) const; - - uint32_t read(::apache::thrift::protocol::TProtocol* iprot); - uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; - -}; - -typedef struct _Airavata_getUserProfileByName_presult__isset { - _Airavata_getUserProfileByName_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {} - bool success :1; - bool ire :1; - bool ace :1; - bool ase :1; - bool ae :1; -} _Airavata_getUserProfileByName_presult__isset; - -class Airavata_getUserProfileByName_presult { - public: - - - virtual ~Airavata_getUserProfileByName_presult() throw(); - ::apache::airavata::model::user::UserProfile* success; - ::apache::airavata::api::error::InvalidRequestException ire; - ::apache::airavata::api::error::AiravataClientException ace; - ::apache::airavata::api::error::AiravataSystemException ase; - ::apache::airavata::api::error::AuthorizationException ae; - - _Airavata_getUserProfileByName_presult__isset __isset; - - uint32_t read(::apache::thrift::protocol::TProtocol* iprot); - -}; - - class Airavata_doesUserProfileExist_args { public: Airavata_doesUserProfileExist_args(const Airavata_doesUserProfileExist_args&); Airavata_doesUserProfileExist_args& operator=(const Airavata_doesUserProfileExist_args&); - Airavata_doesUserProfileExist_args() : userName(), gatewayId() { + Airavata_doesUserProfileExist_args() : userId(), gatewayId() { } virtual ~Airavata_doesUserProfileExist_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string userName; + std::string userId; std::string gatewayId; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_userName(const std::string& val); + void __set_userId(const std::string& val); void __set_gatewayId(const std::string& val); @@ -28336,7 +28190,7 @@ class Airavata_doesUserProfileExist_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(userName == rhs.userName)) + if (!(userId == rhs.userId)) return false; if (!(gatewayId == rhs.gatewayId)) return false; @@ -28360,7 +28214,7 @@ class Airavata_doesUserProfileExist_pargs { virtual ~Airavata_doesUserProfileExist_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* userName; + const std::string* userId; const std::string* gatewayId; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -29001,11 +28855,8 @@ class AiravataClient : virtual public AiravataIf { void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit); void send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit); void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return); - void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - void send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - void recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return); - bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - void send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); + bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId); + void send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId); bool recv_doesUserProfileExist(); protected: boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_; @@ -29196,7 +29047,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor { void process_getUserProfileById(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_deleteUserProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_getAllUserProfilesInGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); - void process_getUserProfileByName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); void process_doesUserProfileExist(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext); public: AiravataProcessor(boost::shared_ptr iface) : @@ -29375,7 +29225,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor { processMap_["getUserProfileById"] = &AiravataProcessor::process_getUserProfileById; processMap_["deleteUserProfile"] = &AiravataProcessor::process_deleteUserProfile; processMap_["getAllUserProfilesInGateway"] = &AiravataProcessor::process_getAllUserProfilesInGateway; - processMap_["getUserProfileByName"] = &AiravataProcessor::process_getUserProfileByName; processMap_["doesUserProfileExist"] = &AiravataProcessor::process_doesUserProfileExist; } @@ -31075,23 +30924,13 @@ class AiravataMultiface : virtual public AiravataIf { return; } - void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { - size_t sz = ifaces_.size(); - size_t i = 0; - for (; i < (sz - 1); ++i) { - ifaces_[i]->getUserProfileByName(_return, authzToken, userName, gatewayId); - } - ifaces_[i]->getUserProfileByName(_return, authzToken, userName, gatewayId); - return; - } - - bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { + bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->doesUserProfileExist(authzToken, userName, gatewayId); + ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId); } - return ifaces_[i]->doesUserProfileExist(authzToken, userName, gatewayId); + return ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId); } }; @@ -31646,11 +31485,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit); int32_t send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit); void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const int32_t seqid); - void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - int32_t send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - void recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const int32_t seqid); - bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); - int32_t send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId); + bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId); + int32_t send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId); bool recv_doesUserProfileExist(const int32_t seqid); protected: boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_; http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp index 4c913bb..d0321c7 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp @@ -3536,12 +3536,7 @@ class AiravataHandler : virtual public AiravataIf { printf("getAllUserProfilesInGateway\n"); } - void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { - // Your implementation goes here - printf("getUserProfileByName\n"); - } - - bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) { + bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) { // Your implementation goes here printf("doesUserProfileExist\n"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp index 52598ef..852a9d0 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp @@ -506,6 +506,11 @@ void ApplicationDeploymentDescription::__set_defaultCPUCount(const int32_t val) __isset.defaultCPUCount = true; } +void ApplicationDeploymentDescription::__set_defaultWalltime(const int32_t val) { + this->defaultWalltime = val; +__isset.defaultWalltime = true; +} + void ApplicationDeploymentDescription::__set_editableByUser(const bool val) { this->editableByUser = val; __isset.editableByUser = true; @@ -732,6 +737,14 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro } break; case 16: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->defaultWalltime); + this->__isset.defaultWalltime = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 17: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->editableByUser); this->__isset.editableByUser = true; @@ -884,8 +897,13 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr xfer += oprot->writeI32(this->defaultCPUCount); xfer += oprot->writeFieldEnd(); } + if (this->__isset.defaultWalltime) { + xfer += oprot->writeFieldBegin("defaultWalltime", ::apache::thrift::protocol::T_I32, 16); + xfer += oprot->writeI32(this->defaultWalltime); + xfer += oprot->writeFieldEnd(); + } if (this->__isset.editableByUser) { - xfer += oprot->writeFieldBegin("editableByUser", ::apache::thrift::protocol::T_BOOL, 16); + xfer += oprot->writeFieldBegin("editableByUser", ::apache::thrift::protocol::T_BOOL, 17); xfer += oprot->writeBool(this->editableByUser); xfer += oprot->writeFieldEnd(); } @@ -911,6 +929,7 @@ void swap(ApplicationDeploymentDescription &a, ApplicationDeploymentDescription swap(a.defaultQueueName, b.defaultQueueName); swap(a.defaultNodeCount, b.defaultNodeCount); swap(a.defaultCPUCount, b.defaultCPUCount); + swap(a.defaultWalltime, b.defaultWalltime); swap(a.editableByUser, b.editableByUser); swap(a.__isset, b.__isset); } @@ -931,6 +950,7 @@ ApplicationDeploymentDescription::ApplicationDeploymentDescription(const Applica defaultQueueName = other43.defaultQueueName; defaultNodeCount = other43.defaultNodeCount; defaultCPUCount = other43.defaultCPUCount; + defaultWalltime = other43.defaultWalltime; editableByUser = other43.editableByUser; __isset = other43.__isset; } @@ -950,6 +970,7 @@ ApplicationDeploymentDescription& ApplicationDeploymentDescription::operator=(co defaultQueueName = other44.defaultQueueName; defaultNodeCount = other44.defaultNodeCount; defaultCPUCount = other44.defaultCPUCount; + defaultWalltime = other44.defaultWalltime; editableByUser = other44.editableByUser; __isset = other44.__isset; return *this; @@ -972,6 +993,7 @@ void ApplicationDeploymentDescription::printTo(std::ostream& out) const { out << ", " << "defaultQueueName="; (__isset.defaultQueueName ? (out << to_string(defaultQueueName)) : (out << "")); out << ", " << "defaultNodeCount="; (__isset.defaultNodeCount ? (out << to_string(defaultNodeCount)) : (out << "")); out << ", " << "defaultCPUCount="; (__isset.defaultCPUCount ? (out << to_string(defaultCPUCount)) : (out << "")); + out << ", " << "defaultWalltime="; (__isset.defaultWalltime ? (out << to_string(defaultWalltime)) : (out << "")); out << ", " << "editableByUser="; (__isset.editableByUser ? (out << to_string(editableByUser)) : (out << "")); out << ")"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h index 42599df..c2875bd 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h @@ -224,7 +224,7 @@ inline std::ostream& operator<<(std::ostream& out, const ApplicationModule& obj) } typedef struct _ApplicationDeploymentDescription__isset { - _ApplicationDeploymentDescription__isset() : appDeploymentDescription(false), moduleLoadCmds(false), libPrependPaths(false), libAppendPaths(false), setEnvironment(false), preJobCommands(false), postJobCommands(false), defaultQueueName(false), defaultNodeCount(false), defaultCPUCount(false), editableByUser(false) {} + _ApplicationDeploymentDescription__isset() : appDeploymentDescription(false), moduleLoadCmds(false), libPrependPaths(false), libAppendPaths(false), setEnvironment(false), preJobCommands(false), postJobCommands(false), defaultQueueName(false), defaultNodeCount(false), defaultCPUCount(false), defaultWalltime(false), editableByUser(false) {} bool appDeploymentDescription :1; bool moduleLoadCmds :1; bool libPrependPaths :1; @@ -235,6 +235,7 @@ typedef struct _ApplicationDeploymentDescription__isset { bool defaultQueueName :1; bool defaultNodeCount :1; bool defaultCPUCount :1; + bool defaultWalltime :1; bool editableByUser :1; } _ApplicationDeploymentDescription__isset; @@ -243,7 +244,7 @@ class ApplicationDeploymentDescription { ApplicationDeploymentDescription(const ApplicationDeploymentDescription&); ApplicationDeploymentDescription& operator=(const ApplicationDeploymentDescription&); - ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism(( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0), appDeploymentDescription(), defaultQueueName(), defaultNodeCount(0), defaultCPUCount(0), editableByUser(0) { + ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism(( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0), appDeploymentDescription(), defaultQueueName(), defaultNodeCount(0), defaultCPUCount(0), defaultWalltime(0), editableByUser(0) { parallelism = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0; } @@ -264,6 +265,7 @@ class ApplicationDeploymentDescription { std::string defaultQueueName; int32_t defaultNodeCount; int32_t defaultCPUCount; + int32_t defaultWalltime; bool editableByUser; _ApplicationDeploymentDescription__isset __isset; @@ -298,6 +300,8 @@ class ApplicationDeploymentDescription { void __set_defaultCPUCount(const int32_t val); + void __set_defaultWalltime(const int32_t val); + void __set_editableByUser(const bool val); bool operator == (const ApplicationDeploymentDescription & rhs) const @@ -352,6 +356,10 @@ class ApplicationDeploymentDescription { return false; else if (__isset.defaultCPUCount && !(defaultCPUCount == rhs.defaultCPUCount)) return false; + if (__isset.defaultWalltime != rhs.__isset.defaultWalltime) + return false; + else if (__isset.defaultWalltime && !(defaultWalltime == rhs.defaultWalltime)) + return false; if (__isset.editableByUser != rhs.__isset.editableByUser) return false; else if (__isset.editableByUser && !(editableByUser == rhs.editableByUser)) http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp index 1f6cb42..7921ef3 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp @@ -1792,6 +1792,26 @@ void ComputeResourceDescription::__set_gatewayUsageExecutable(const std::string& __isset.gatewayUsageExecutable = true; } +void ComputeResourceDescription::__set_cpusPerNode(const int32_t val) { + this->cpusPerNode = val; +__isset.cpusPerNode = true; +} + +void ComputeResourceDescription::__set_defaultNodeCount(const int32_t val) { + this->defaultNodeCount = val; +__isset.defaultNodeCount = true; +} + +void ComputeResourceDescription::__set_defaultCPUCount(const int32_t val) { + this->defaultCPUCount = val; +__isset.defaultCPUCount = true; +} + +void ComputeResourceDescription::__set_defaultWallltime(const int32_t val) { + this->defaultWallltime = val; +__isset.defaultWallltime = true; +} + uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) { apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); @@ -2004,6 +2024,38 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* xfer += iprot->skip(ftype); } break; + case 15: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->cpusPerNode); + this->__isset.cpusPerNode = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 16: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->defaultNodeCount); + this->__isset.defaultNodeCount = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 17: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->defaultCPUCount); + this->__isset.defaultCPUCount = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 18: + if (ftype == ::apache::thrift::protocol::T_I32) { + xfer += iprot->readI32(this->defaultWallltime); + this->__isset.defaultWallltime = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -2142,6 +2194,26 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeString(this->gatewayUsageExecutable); xfer += oprot->writeFieldEnd(); } + if (this->__isset.cpusPerNode) { + xfer += oprot->writeFieldBegin("cpusPerNode", ::apache::thrift::protocol::T_I32, 15); + xfer += oprot->writeI32(this->cpusPerNode); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.defaultNodeCount) { + xfer += oprot->writeFieldBegin("defaultNodeCount", ::apache::thrift::protocol::T_I32, 16); + xfer += oprot->writeI32(this->defaultNodeCount); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.defaultCPUCount) { + xfer += oprot->writeFieldBegin("defaultCPUCount", ::apache::thrift::protocol::T_I32, 17); + xfer += oprot->writeI32(this->defaultCPUCount); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.defaultWallltime) { + xfer += oprot->writeFieldBegin("defaultWallltime", ::apache::thrift::protocol::T_I32, 18); + xfer += oprot->writeI32(this->defaultWallltime); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -2163,6 +2235,10 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) { swap(a.gatewayUsageReporting, b.gatewayUsageReporting); swap(a.gatewayUsageModuleLoadCommand, b.gatewayUsageModuleLoadCommand); swap(a.gatewayUsageExecutable, b.gatewayUsageExecutable); + swap(a.cpusPerNode, b.cpusPerNode); + swap(a.defaultNodeCount, b.defaultNodeCount); + swap(a.defaultCPUCount, b.defaultCPUCount); + swap(a.defaultWallltime, b.defaultWallltime); swap(a.__isset, b.__isset); } @@ -2181,6 +2257,10 @@ ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDesc gatewayUsageReporting = other94.gatewayUsageReporting; gatewayUsageModuleLoadCommand = other94.gatewayUsageModuleLoadCommand; gatewayUsageExecutable = other94.gatewayUsageExecutable; + cpusPerNode = other94.cpusPerNode; + defaultNodeCount = other94.defaultNodeCount; + defaultCPUCount = other94.defaultCPUCount; + defaultWallltime = other94.defaultWallltime; __isset = other94.__isset; } ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeResourceDescription& other95) { @@ -2198,6 +2278,10 @@ ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeR gatewayUsageReporting = other95.gatewayUsageReporting; gatewayUsageModuleLoadCommand = other95.gatewayUsageModuleLoadCommand; gatewayUsageExecutable = other95.gatewayUsageExecutable; + cpusPerNode = other95.cpusPerNode; + defaultNodeCount = other95.defaultNodeCount; + defaultCPUCount = other95.defaultCPUCount; + defaultWallltime = other95.defaultWallltime; __isset = other95.__isset; return *this; } @@ -2218,6 +2302,10 @@ void ComputeResourceDescription::printTo(std::ostream& out) const { out << ", " << "gatewayUsageReporting="; (__isset.gatewayUsageReporting ? (out << to_string(gatewayUsageReporting)) : (out << "")); out << ", " << "gatewayUsageModuleLoadCommand="; (__isset.gatewayUsageModuleLoadCommand ? (out << to_string(gatewayUsageModuleLoadCommand)) : (out << "")); out << ", " << "gatewayUsageExecutable="; (__isset.gatewayUsageExecutable ? (out << to_string(gatewayUsageExecutable)) : (out << "")); + out << ", " << "cpusPerNode="; (__isset.cpusPerNode ? (out << to_string(cpusPerNode)) : (out << "")); + out << ", " << "defaultNodeCount="; (__isset.defaultNodeCount ? (out << to_string(defaultNodeCount)) : (out << "")); + out << ", " << "defaultCPUCount="; (__isset.defaultCPUCount ? (out << to_string(defaultCPUCount)) : (out << "")); + out << ", " << "defaultWallltime="; (__isset.defaultWallltime ? (out << to_string(defaultWallltime)) : (out << "")); out << ")"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h index d611b52..997c2cb 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h @@ -711,7 +711,7 @@ inline std::ostream& operator<<(std::ostream& out, const JobSubmissionInterface& } typedef struct _ComputeResourceDescription__isset { - _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), gatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false) {} + _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), gatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false), cpusPerNode(false), defaultNodeCount(false), defaultCPUCount(false), defaultWallltime(false) {} bool hostAliases :1; bool ipAddresses :1; bool resourceDescription :1; @@ -724,6 +724,10 @@ typedef struct _ComputeResourceDescription__isset { bool gatewayUsageReporting :1; bool gatewayUsageModuleLoadCommand :1; bool gatewayUsageExecutable :1; + bool cpusPerNode :1; + bool defaultNodeCount :1; + bool defaultCPUCount :1; + bool defaultWallltime :1; } _ComputeResourceDescription__isset; class ComputeResourceDescription { @@ -731,7 +735,7 @@ class ComputeResourceDescription { ComputeResourceDescription(const ComputeResourceDescription&); ComputeResourceDescription& operator=(const ComputeResourceDescription&); - ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), gatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable() { + ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), gatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable(), cpusPerNode(0), defaultNodeCount(0), defaultCPUCount(0), defaultWallltime(0) { } virtual ~ComputeResourceDescription() throw(); @@ -749,6 +753,10 @@ class ComputeResourceDescription { bool gatewayUsageReporting; std::string gatewayUsageModuleLoadCommand; std::string gatewayUsageExecutable; + int32_t cpusPerNode; + int32_t defaultNodeCount; + int32_t defaultCPUCount; + int32_t defaultWallltime; _ComputeResourceDescription__isset __isset; @@ -780,6 +788,14 @@ class ComputeResourceDescription { void __set_gatewayUsageExecutable(const std::string& val); + void __set_cpusPerNode(const int32_t val); + + void __set_defaultNodeCount(const int32_t val); + + void __set_defaultCPUCount(const int32_t val); + + void __set_defaultWallltime(const int32_t val); + bool operator == (const ComputeResourceDescription & rhs) const { if (!(computeResourceId == rhs.computeResourceId)) @@ -834,6 +850,22 @@ class ComputeResourceDescription { return false; else if (__isset.gatewayUsageExecutable && !(gatewayUsageExecutable == rhs.gatewayUsageExecutable)) return false; + if (__isset.cpusPerNode != rhs.__isset.cpusPerNode) + return false; + else if (__isset.cpusPerNode && !(cpusPerNode == rhs.cpusPerNode)) + return false; + if (__isset.defaultNodeCount != rhs.__isset.defaultNodeCount) + return false; + else if (__isset.defaultNodeCount && !(defaultNodeCount == rhs.defaultNodeCount)) + return false; + if (__isset.defaultCPUCount != rhs.__isset.defaultCPUCount) + return false; + else if (__isset.defaultCPUCount && !(defaultCPUCount == rhs.defaultCPUCount)) + return false; + if (__isset.defaultWallltime != rhs.__isset.defaultWallltime) + return false; + else if (__isset.defaultWallltime && !(defaultWallltime == rhs.defaultWallltime)) + return false; return true; } bool operator != (const ComputeResourceDescription &rhs) const { http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp index a7b968a..a3870cd 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp @@ -431,11 +431,6 @@ void UserProfile::__set_nameSuffix(const std::string& val) { __isset.nameSuffix = true; } -void UserProfile::__set_userName(const std::string& val) { - this->userName = val; -__isset.userName = true; -} - void UserProfile::__set_orcidId(const std::string& val) { this->orcidId = val; __isset.orcidId = true; @@ -633,21 +628,13 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { break; case 11: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->userName); - this->__isset.userName = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 12: - if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->orcidId); this->__isset.orcidId = true; } else { xfer += iprot->skip(ftype); } break; - case 13: + case 12: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->phones.clear(); @@ -667,7 +654,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 14: + case 13: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->country); this->__isset.country = true; @@ -675,7 +662,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 15: + case 14: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->nationality.clear(); @@ -695,7 +682,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 16: + case 15: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->homeOrganization); this->__isset.homeOrganization = true; @@ -703,7 +690,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 17: + case 16: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->orginationAffiliation); this->__isset.orginationAffiliation = true; @@ -711,7 +698,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 18: + case 17: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->creationTime); isset_creationTime = true; @@ -719,7 +706,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 19: + case 18: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->lastAccessTime); isset_lastAccessTime = true; @@ -727,7 +714,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 20: + case 19: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->validUntil); isset_validUntil = true; @@ -735,7 +722,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 21: + case 20: if (ftype == ::apache::thrift::protocol::T_I32) { int32_t ecast39; xfer += iprot->readI32(ecast39); @@ -745,7 +732,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 22: + case 21: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->comments); this->__isset.comments = true; @@ -753,7 +740,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 23: + case 22: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->labeledURI.clear(); @@ -773,7 +760,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 24: + case 23: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->gpgKey); this->__isset.gpgKey = true; @@ -781,7 +768,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 25: + case 24: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->timeZone); this->__isset.timeZone = true; @@ -789,7 +776,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 26: + case 25: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->nsfDemographics.read(iprot); this->__isset.nsfDemographics = true; @@ -887,18 +874,13 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeString(this->nameSuffix); xfer += oprot->writeFieldEnd(); } - if (this->__isset.userName) { - xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 11); - xfer += oprot->writeString(this->userName); - xfer += oprot->writeFieldEnd(); - } if (this->__isset.orcidId) { - xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 12); + xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 11); xfer += oprot->writeString(this->orcidId); xfer += oprot->writeFieldEnd(); } if (this->__isset.phones) { - xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 13); + xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 12); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->phones.size())); std::vector ::const_iterator _iter46; @@ -911,12 +893,12 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeFieldEnd(); } if (this->__isset.country) { - xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 14); + xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 13); xfer += oprot->writeString(this->country); xfer += oprot->writeFieldEnd(); } if (this->__isset.nationality) { - xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 15); + xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 14); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->nationality.size())); std::vector ::const_iterator _iter47; @@ -929,38 +911,38 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeFieldEnd(); } if (this->__isset.homeOrganization) { - xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 16); + xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 15); xfer += oprot->writeString(this->homeOrganization); xfer += oprot->writeFieldEnd(); } if (this->__isset.orginationAffiliation) { - xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 17); + xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 16); xfer += oprot->writeString(this->orginationAffiliation); xfer += oprot->writeFieldEnd(); } - xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 18); + xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 17); xfer += oprot->writeI64(this->creationTime); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_I64, 19); + xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_I64, 18); xfer += oprot->writeI64(this->lastAccessTime); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_I64, 20); + xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_I64, 19); xfer += oprot->writeI64(this->validUntil); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 21); + xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 20); xfer += oprot->writeI32((int32_t)this->State); xfer += oprot->writeFieldEnd(); if (this->__isset.comments) { - xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 22); + xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 21); xfer += oprot->writeString(this->comments); xfer += oprot->writeFieldEnd(); } if (this->__isset.labeledURI) { - xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 23); + xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 22); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->labeledURI.size())); std::vector ::const_iterator _iter48; @@ -973,17 +955,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const xfer += oprot->writeFieldEnd(); } if (this->__isset.gpgKey) { - xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 24); + xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 23); xfer += oprot->writeString(this->gpgKey); xfer += oprot->writeFieldEnd(); } if (this->__isset.timeZone) { - xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 25); + xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 24); xfer += oprot->writeString(this->timeZone); xfer += oprot->writeFieldEnd(); } if (this->__isset.nsfDemographics) { - xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 26); + xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 25); xfer += this->nsfDemographics.write(oprot); xfer += oprot->writeFieldEnd(); } @@ -1004,7 +986,6 @@ void swap(UserProfile &a, UserProfile &b) { swap(a.middleName, b.middleName); swap(a.namePrefix, b.namePrefix); swap(a.nameSuffix, b.nameSuffix); - swap(a.userName, b.userName); swap(a.orcidId, b.orcidId); swap(a.phones, b.phones); swap(a.country, b.country); @@ -1034,7 +1015,6 @@ UserProfile::UserProfile(const UserProfile& other49) { middleName = other49.middleName; namePrefix = other49.namePrefix; nameSuffix = other49.nameSuffix; - userName = other49.userName; orcidId = other49.orcidId; phones = other49.phones; country = other49.country; @@ -1063,7 +1043,6 @@ UserProfile& UserProfile::operator=(const UserProfile& other50) { middleName = other50.middleName; namePrefix = other50.namePrefix; nameSuffix = other50.nameSuffix; - userName = other50.userName; orcidId = other50.orcidId; phones = other50.phones; country = other50.country; @@ -1095,7 +1074,6 @@ void UserProfile::printTo(std::ostream& out) const { out << ", " << "middleName="; (__isset.middleName ? (out << to_string(middleName)) : (out << "")); out << ", " << "namePrefix="; (__isset.namePrefix ? (out << to_string(namePrefix)) : (out << "")); out << ", " << "nameSuffix="; (__isset.nameSuffix ? (out << to_string(nameSuffix)) : (out << "")); - out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "")); out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "")); out << ", " << "phones="; (__isset.phones ? (out << to_string(phones)) : (out << "")); out << ", " << "country="; (__isset.country ? (out << to_string(country)) : (out << "")); http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h index 1d5b3be..8f9181b 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h @@ -190,11 +190,10 @@ inline std::ostream& operator<<(std::ostream& out, const NSFDemographics& obj) } typedef struct _UserProfile__isset { - _UserProfile__isset() : middleName(false), namePrefix(false), nameSuffix(false), userName(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {} + _UserProfile__isset() : middleName(false), namePrefix(false), nameSuffix(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {} bool middleName :1; bool namePrefix :1; bool nameSuffix :1; - bool userName :1; bool orcidId :1; bool phones :1; bool country :1; @@ -213,7 +212,7 @@ class UserProfile { UserProfile(const UserProfile&); UserProfile& operator=(const UserProfile&); - UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), gatewayId(), firstName(), lastName(), middleName(), namePrefix(), nameSuffix(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(0), lastAccessTime(0), validUntil(0), State((Status::type)0), comments(), gpgKey(), timeZone() { + UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), gatewayId(), firstName(), lastName(), middleName(), namePrefix(), nameSuffix(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(0), lastAccessTime(0), validUntil(0), State((Status::type)0), comments(), gpgKey(), timeZone() { } virtual ~UserProfile() throw(); @@ -227,7 +226,6 @@ class UserProfile { std::string middleName; std::string namePrefix; std::string nameSuffix; - std::string userName; std::string orcidId; std::vector phones; std::string country; @@ -266,8 +264,6 @@ class UserProfile { void __set_nameSuffix(const std::string& val); - void __set_userName(const std::string& val); - void __set_orcidId(const std::string& val); void __set_phones(const std::vector & val); @@ -326,10 +322,6 @@ class UserProfile { return false; else if (__isset.nameSuffix && !(nameSuffix == rhs.nameSuffix)) return false; - if (__isset.userName != rhs.__isset.userName) - return false; - else if (__isset.userName && !(userName == rhs.userName)) - return false; if (__isset.orcidId != rhs.__isset.orcidId) return false; else if (__isset.orcidId && !(orcidId == rhs.orcidId))