adding the initial version of the data catalog
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e89f3ea6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e89f3ea6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e89f3ea6 Branch: refs/heads/data-manager Commit: e89f3ea63a2d5950a51c4bdc61bb0c214173758d Parents: 3df02b8 Author: scnakandala <[email protected]> Authored: Wed Dec 2 17:53:48 2015 -0500 Committer: scnakandala <[email protected]> Committed: Tue Jan 12 10:56:04 2016 -0500 ---------------------------------------------------------------------- .../main/resources/lib/airavata/Airavata.cpp | 40 +- .../src/main/resources/lib/airavata/Airavata.h | 53 +- .../lib/airavata/Airavata_server.skeleton.cpp | 2 +- .../resources/lib/Airavata/API/Airavata.php | 45 +- .../lib/apache/airavata/api/Airavata-remote | 2 +- .../lib/apache/airavata/api/Airavata.py | 30 +- modules/registry/logs/airavata.log | 2929 ++++++++++++++++++ 7 files changed, 3053 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/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 a6e3cf1..c0c97ea 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 @@ -41476,6 +41476,14 @@ uint32_t Airavata_publishDataResource_result::read(::apache::thrift::protocol::T } switch (fid) { + case 0: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->success); + this->__isset.success = true; + } else { + xfer += iprot->skip(ftype); + } + break; case 1: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->ire.read(iprot); @@ -41526,7 +41534,11 @@ uint32_t Airavata_publishDataResource_result::write(::apache::thrift::protocol:: xfer += oprot->writeStructBegin("Airavata_publishDataResource_result"); - if (this->__isset.ire) { + if (this->__isset.success) { + xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0); + xfer += oprot->writeString(this->success); + 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(); @@ -41573,6 +41585,14 @@ uint32_t Airavata_publishDataResource_presult::read(::apache::thrift::protocol:: } switch (fid) { + case 0: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString((*(this->success))); + this->__isset.success = true; + } else { + xfer += iprot->skip(ftype); + } + break; case 1: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->ire.read(iprot); @@ -51069,13 +51089,13 @@ bool AiravataClient::recv_isWorkflowExistWithName() throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isWorkflowExistWithName failed: unknown result"); } -void AiravataClient::publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel) +void AiravataClient::publishDataResource(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel) { send_publishDataResource(authzToken, resourceModel); - recv_publishDataResource(); + recv_publishDataResource(_return); } -void AiravataClient::send_publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel) +void AiravataClient::send_publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel) { int32_t cseqid = 0; oprot_->writeMessageBegin("publishDataResource", ::apache::thrift::protocol::T_CALL, cseqid); @@ -51090,7 +51110,7 @@ void AiravataClient::send_publishDataResource(const ::apache::airavata::model:: oprot_->getTransport()->flush(); } -void AiravataClient::recv_publishDataResource() +void AiravataClient::recv_publishDataResource(std::string& _return) { int32_t rseqid = 0; @@ -51116,10 +51136,15 @@ void AiravataClient::recv_publishDataResource() iprot_->getTransport()->readEnd(); } Airavata_publishDataResource_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; } @@ -51132,7 +51157,7 @@ void AiravataClient::recv_publishDataResource() if (result.__isset.ae) { throw result.ae; } - return; + throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "publishDataResource failed: unknown result"); } bool AiravataProcessor::dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext) { @@ -59895,7 +59920,8 @@ void AiravataProcessor::process_publishDataResource(int32_t seqid, ::apache::thr Airavata_publishDataResource_result result; try { - iface_->publishDataResource(args.authzToken, args.resourceModel); + iface_->publishDataResource(result.success, args.authzToken, args.resourceModel); + result.__isset.success = true; } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) { result.ire = ire; result.__isset.ire = true; http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/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 0c19761..4adbd55 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 @@ -2272,7 +2272,7 @@ class AiravataIf { virtual void updateWorkflow(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId, const ::Workflow& workflow) = 0; virtual void getWorkflowTemplateId(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName) = 0; virtual bool isWorkflowExistWithName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName) = 0; - virtual void publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel) = 0; + virtual void publishDataResource(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel) = 0; }; class AiravataIfFactory { @@ -2740,7 +2740,7 @@ class AiravataNull : virtual public AiravataIf { bool _return = false; return _return; } - void publishDataResource(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::resource::ResourceModel& /* resourceModel */) { + void publishDataResource(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::data::resource::DataResourceModel& /* resourceModel */) { return; } }; @@ -21353,8 +21353,8 @@ typedef struct _Airavata_publishDataResource_args__isset { class Airavata_publishDataResource_args { public: - static const char* ascii_fingerprint; // = "312BA5A54BBA157D64BAD509924F7B34"; - static const uint8_t binary_fingerprint[16]; // = {0x31,0x2B,0xA5,0xA5,0x4B,0xBA,0x15,0x7D,0x64,0xBA,0xD5,0x09,0x92,0x4F,0x7B,0x34}; + static const char* ascii_fingerprint; // = "3CA987536633345DF8FE6263AF84A8FF"; + static const uint8_t binary_fingerprint[16]; // = {0x3C,0xA9,0x87,0x53,0x66,0x33,0x34,0x5D,0xF8,0xFE,0x62,0x63,0xAF,0x84,0xA8,0xFF}; Airavata_publishDataResource_args(const Airavata_publishDataResource_args&); Airavata_publishDataResource_args& operator=(const Airavata_publishDataResource_args&); @@ -21363,13 +21363,13 @@ class Airavata_publishDataResource_args { virtual ~Airavata_publishDataResource_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - ::apache::airavata::model::data::resource::ResourceModel resourceModel; + ::apache::airavata::model::data::resource::DataResourceModel resourceModel; _Airavata_publishDataResource_args__isset __isset; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceModel(const ::apache::airavata::model::data::resource::ResourceModel& val); + void __set_resourceModel(const ::apache::airavata::model::data::resource::DataResourceModel& val); bool operator == (const Airavata_publishDataResource_args & rhs) const { @@ -21395,13 +21395,13 @@ class Airavata_publishDataResource_args { class Airavata_publishDataResource_pargs { public: - static const char* ascii_fingerprint; // = "312BA5A54BBA157D64BAD509924F7B34"; - static const uint8_t binary_fingerprint[16]; // = {0x31,0x2B,0xA5,0xA5,0x4B,0xBA,0x15,0x7D,0x64,0xBA,0xD5,0x09,0x92,0x4F,0x7B,0x34}; + static const char* ascii_fingerprint; // = "3CA987536633345DF8FE6263AF84A8FF"; + static const uint8_t binary_fingerprint[16]; // = {0x3C,0xA9,0x87,0x53,0x66,0x33,0x34,0x5D,0xF8,0xFE,0x62,0x63,0xAF,0x84,0xA8,0xFF}; virtual ~Airavata_publishDataResource_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const ::apache::airavata::model::data::resource::ResourceModel* resourceModel; + const ::apache::airavata::model::data::resource::DataResourceModel* resourceModel; uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -21409,7 +21409,8 @@ class Airavata_publishDataResource_pargs { }; typedef struct _Airavata_publishDataResource_result__isset { - _Airavata_publishDataResource_result__isset() : ire(false), ace(false), ase(false), ae(false) {} + _Airavata_publishDataResource_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {} + bool success :1; bool ire :1; bool ace :1; bool ase :1; @@ -21419,15 +21420,16 @@ typedef struct _Airavata_publishDataResource_result__isset { class Airavata_publishDataResource_result { public: - static const char* ascii_fingerprint; // = "0603929641B3F91F81AA6AC437512303"; - static const uint8_t binary_fingerprint[16]; // = {0x06,0x03,0x92,0x96,0x41,0xB3,0xF9,0x1F,0x81,0xAA,0x6A,0xC4,0x37,0x51,0x23,0x03}; + static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023"; + static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23}; Airavata_publishDataResource_result(const Airavata_publishDataResource_result&); Airavata_publishDataResource_result& operator=(const Airavata_publishDataResource_result&); - Airavata_publishDataResource_result() { + Airavata_publishDataResource_result() : success() { } virtual ~Airavata_publishDataResource_result() throw(); + std::string success; ::apache::airavata::api::error::InvalidRequestException ire; ::apache::airavata::api::error::AiravataClientException ace; ::apache::airavata::api::error::AiravataSystemException ase; @@ -21435,6 +21437,8 @@ class Airavata_publishDataResource_result { _Airavata_publishDataResource_result__isset __isset; + void __set_success(const std::string& val); + void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val); void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val); @@ -21445,6 +21449,8 @@ class Airavata_publishDataResource_result { bool operator == (const Airavata_publishDataResource_result & rhs) const { + if (!(success == rhs.success)) + return false; if (!(ire == rhs.ire)) return false; if (!(ace == rhs.ace)) @@ -21468,7 +21474,8 @@ class Airavata_publishDataResource_result { }; typedef struct _Airavata_publishDataResource_presult__isset { - _Airavata_publishDataResource_presult__isset() : ire(false), ace(false), ase(false), ae(false) {} + _Airavata_publishDataResource_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {} + bool success :1; bool ire :1; bool ace :1; bool ase :1; @@ -21478,11 +21485,12 @@ typedef struct _Airavata_publishDataResource_presult__isset { class Airavata_publishDataResource_presult { public: - static const char* ascii_fingerprint; // = "0603929641B3F91F81AA6AC437512303"; - static const uint8_t binary_fingerprint[16]; // = {0x06,0x03,0x92,0x96,0x41,0xB3,0xF9,0x1F,0x81,0xAA,0x6A,0xC4,0x37,0x51,0x23,0x03}; + static const char* ascii_fingerprint; // = "21BF57A9FE5AAA661540804D4FB9F023"; + static const uint8_t binary_fingerprint[16]; // = {0x21,0xBF,0x57,0xA9,0xFE,0x5A,0xAA,0x66,0x15,0x40,0x80,0x4D,0x4F,0xB9,0xF0,0x23}; virtual ~Airavata_publishDataResource_presult() throw(); + std::string* success; ::apache::airavata::api::error::InvalidRequestException ire; ::apache::airavata::api::error::AiravataClientException ace; ::apache::airavata::api::error::AiravataSystemException ase; @@ -21916,9 +21924,9 @@ class AiravataClient : virtual public AiravataIf { bool isWorkflowExistWithName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName); void send_isWorkflowExistWithName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowName); bool recv_isWorkflowExistWithName(); - void publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel); - void send_publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel); - void recv_publishDataResource(); + void publishDataResource(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel); + void send_publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel); + void recv_publishDataResource(std::string& _return); protected: boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_; boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_; @@ -23500,13 +23508,14 @@ class AiravataMultiface : virtual public AiravataIf { return ifaces_[i]->isWorkflowExistWithName(authzToken, workflowName); } - void publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel) { + void publishDataResource(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->publishDataResource(authzToken, resourceModel); + ifaces_[i]->publishDataResource(_return, authzToken, resourceModel); } - ifaces_[i]->publishDataResource(authzToken, resourceModel); + ifaces_[i]->publishDataResource(_return, authzToken, resourceModel); + return; } }; http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/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 1a949d0..16d1af9 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 @@ -2688,7 +2688,7 @@ class AiravataHandler : virtual public AiravataIf { printf("isWorkflowExistWithName\n"); } - void publishDataResource(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::ResourceModel& resourceModel) { + void publishDataResource(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::data::resource::DataResourceModel& resourceModel) { // Your implementation goes here printf("publishDataResource\n"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php index ba22aca..326751b 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php @@ -3125,13 +3125,14 @@ interface AiravataIf { public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName); /** * @param \Airavata\Model\Security\AuthzToken $authzToken - * @param \Airavata\Model\Data\Resource\ResourceModel $resourceModel + * @param \Airavata\Model\Data\Resource\DataResourceModel $resourceModel + * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\ResourceModel $resourceModel); + public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $resourceModel); } class AiravataClient implements \Airavata\API\AiravataIf { @@ -11691,13 +11692,13 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("isWorkflowExistWithName failed: unknown result"); } - public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\ResourceModel $resourceModel) + public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $resourceModel) { $this->send_publishDataResource($authzToken, $resourceModel); - $this->recv_publishDataResource(); + return $this->recv_publishDataResource(); } - public function send_publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\ResourceModel $resourceModel) + public function send_publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $resourceModel) { $args = new \Airavata\API\Airavata_publishDataResource_args(); $args->authzToken = $authzToken; @@ -11737,6 +11738,9 @@ class AiravataClient implements \Airavata\API\AiravataIf { $result->read($this->input_); $this->input_->readMessageEnd(); } + if ($result->success !== null) { + return $result->success; + } if ($result->ire !== null) { throw $result->ire; } @@ -11749,7 +11753,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - return; + throw new \Exception("publishDataResource failed: unknown result"); } } @@ -52291,7 +52295,7 @@ class Airavata_publishDataResource_args { */ public $authzToken = null; /** - * @var \Airavata\Model\Data\Resource\ResourceModel + * @var \Airavata\Model\Data\Resource\DataResourceModel */ public $resourceModel = null; @@ -52306,7 +52310,7 @@ class Airavata_publishDataResource_args { 2 => array( 'var' => 'resourceModel', 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Data\Resource\ResourceModel', + 'class' => '\Airavata\Model\Data\Resource\DataResourceModel', ), ); } @@ -52349,7 +52353,7 @@ class Airavata_publishDataResource_args { break; case 2: if ($ftype == TType::STRUCT) { - $this->resourceModel = new \Airavata\Model\Data\Resource\ResourceModel(); + $this->resourceModel = new \Airavata\Model\Data\Resource\DataResourceModel(); $xfer += $this->resourceModel->read($input); } else { $xfer += $input->skip($ftype); @@ -52395,6 +52399,10 @@ class Airavata_publishDataResource_result { static $_TSPEC; /** + * @var string + */ + public $success = null; + /** * @var \Airavata\API\Error\InvalidRequestException */ public $ire = null; @@ -52414,6 +52422,10 @@ class Airavata_publishDataResource_result { public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( + 0 => array( + 'var' => 'success', + 'type' => TType::STRING, + ), 1 => array( 'var' => 'ire', 'type' => TType::STRUCT, @@ -52437,6 +52449,9 @@ class Airavata_publishDataResource_result { ); } if (is_array($vals)) { + if (isset($vals['success'])) { + $this->success = $vals['success']; + } if (isset($vals['ire'])) { $this->ire = $vals['ire']; } @@ -52471,6 +52486,13 @@ class Airavata_publishDataResource_result { } switch ($fid) { + case 0: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->success); + } else { + $xfer += $input->skip($ftype); + } + break; case 1: if ($ftype == TType::STRUCT) { $this->ire = new \Airavata\API\Error\InvalidRequestException(); @@ -52516,6 +52538,11 @@ class Airavata_publishDataResource_result { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('Airavata_publishDataResource_result'); + if ($this->success !== null) { + $xfer += $output->writeFieldBegin('success', TType::STRING, 0); + $xfer += $output->writeString($this->success); + $xfer += $output->writeFieldEnd(); + } if ($this->ire !== null) { $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1); $xfer += $this->ire->write($output); http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote index b09661a..161b547 100755 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote @@ -156,7 +156,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print(' void updateWorkflow(AuthzToken authzToken, string workflowTemplateId, Workflow workflow)') print(' string getWorkflowTemplateId(AuthzToken authzToken, string workflowName)') print(' bool isWorkflowExistWithName(AuthzToken authzToken, string workflowName)') - print(' void publishDataResource(AuthzToken authzToken, ResourceModel resourceModel)') + print(' string publishDataResource(AuthzToken authzToken, DataResourceModel resourceModel)') print('') sys.exit(0) http://git-wip-us.apache.org/repos/asf/airavata/blob/e89f3ea6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py index 299f5a2..1adc769 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py @@ -9708,7 +9708,7 @@ class Client(Iface): - resourceModel """ self.send_publishDataResource(authzToken, resourceModel) - self.recv_publishDataResource() + return self.recv_publishDataResource() def send_publishDataResource(self, authzToken, resourceModel): self._oprot.writeMessageBegin('publishDataResource', TMessageType.CALL, self._seqid) @@ -9730,6 +9730,8 @@ class Client(Iface): result = publishDataResource_result() result.read(iprot) iprot.readMessageEnd() + if result.success is not None: + return result.success if result.ire is not None: raise result.ire if result.ace is not None: @@ -9738,7 +9740,7 @@ class Client(Iface): raise result.ase if result.ae is not None: raise result.ae - return + raise TApplicationException(TApplicationException.MISSING_RESULT, "publishDataResource failed: unknown result"); class Processor(Iface, TProcessor): @@ -14007,7 +14009,7 @@ class Processor(Iface, TProcessor): iprot.readMessageEnd() result = publishDataResource_result() try: - self._handler.publishDataResource(args.authzToken, args.resourceModel) + result.success = self._handler.publishDataResource(args.authzToken, args.resourceModel) except apache.airavata.api.error.ttypes.InvalidRequestException, ire: result.ire = ire except apache.airavata.api.error.ttypes.AiravataClientException, ace: @@ -42825,7 +42827,7 @@ class publishDataResource_args: thrift_spec = ( None, # 0 (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1 - (2, TType.STRUCT, 'resourceModel', (apache.airavata.model.data.resource.ttypes.ResourceModel, apache.airavata.model.data.resource.ttypes.ResourceModel.thrift_spec), None, ), # 2 + (2, TType.STRUCT, 'resourceModel', (apache.airavata.model.data.resource.ttypes.DataResourceModel, apache.airavata.model.data.resource.ttypes.DataResourceModel.thrift_spec), None, ), # 2 ) def __init__(self, authzToken=None, resourceModel=None,): @@ -42849,7 +42851,7 @@ class publishDataResource_args: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.resourceModel = apache.airavata.model.data.resource.ttypes.ResourceModel() + self.resourceModel = apache.airavata.model.data.resource.ttypes.DataResourceModel() self.resourceModel.read(iprot) else: iprot.skip(ftype) @@ -42900,6 +42902,7 @@ class publishDataResource_args: class publishDataResource_result: """ Attributes: + - success - ire - ace - ase @@ -42907,14 +42910,15 @@ class publishDataResource_result: """ thrift_spec = ( - None, # 0 + (0, TType.STRING, 'success', None, None, ), # 0 (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1 (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2 (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3 (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4 ) - def __init__(self, ire=None, ace=None, ase=None, ae=None,): + def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,): + self.success = success self.ire = ire self.ace = ace self.ase = ase @@ -42929,7 +42933,12 @@ class publishDataResource_result: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break - if fid == 1: + if fid == 0: + if ftype == TType.STRING: + self.success = iprot.readString(); + else: + iprot.skip(ftype) + elif fid == 1: if ftype == TType.STRUCT: self.ire = apache.airavata.api.error.ttypes.InvalidRequestException() self.ire.read(iprot) @@ -42963,6 +42972,10 @@ class publishDataResource_result: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('publishDataResource_result') + if self.success is not None: + oprot.writeFieldBegin('success', TType.STRING, 0) + oprot.writeString(self.success) + oprot.writeFieldEnd() if self.ire is not None: oprot.writeFieldBegin('ire', TType.STRUCT, 1) self.ire.write(oprot) @@ -42988,6 +43001,7 @@ class publishDataResource_result: def __hash__(self): value = 17 + value = (value * 31) ^ hash(self.success) value = (value * 31) ^ hash(self.ire) value = (value * 31) ^ hash(self.ace) value = (value * 31) ^ hash(self.ase)
