From feae502d3afe2a82ab0ef26600d31cec499f23fb Mon Sep 17 00:00:00 2001 From: "haowei.yao" Date: Mon, 18 Mar 2019 11:44:19 +0800 Subject: [PATCH] =?UTF-8?q?OTS=20SDK=20Auto=20Released=20By=20shenshi,Vers?= =?UTF-8?q?ion=EF=BC=9A1.34.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: haowei.yao --- CHANGELOG | 3 + VERSION | 2 +- ots/CMakeLists.txt | 8 +-- ots/include/alibabacloud/ots/OtsClient.h | 16 ++--- .../ots/model/DeleteTagsRequest.h | 2 +- .../ots/model/InsertInstanceRequest.h | 2 +- .../ots/model/InsertTagsRequest.h | 2 +- .../ots/model/ListInstanceRequest.h | 2 +- .../alibabacloud/ots/model/ListTagsRequest.h | 2 +- .../ots/model/ListVpcInfoByVpcRequest.h | 2 +- ots/src/OtsClient.cc | 72 +++++++++---------- ots/src/model/DeleteTagsRequest.cc | 2 +- ots/src/model/InsertInstanceRequest.cc | 2 +- ots/src/model/InsertTagsRequest.cc | 2 +- ots/src/model/ListInstanceRequest.cc | 2 +- ots/src/model/ListTagsRequest.cc | 2 +- ots/src/model/ListVpcInfoByVpcRequest.cc | 2 +- 17 files changed, 64 insertions(+), 61 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3b4144ae9..6f1b06a51 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2019-03-18 Version: 1.34.38 +1, Update Dependency + 2019-03-18 Version: 1.34.37 1, Update Dependency diff --git a/VERSION b/VERSION index 17c2ce8c1..749e932f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.34.37 \ No newline at end of file +1.34.38 \ No newline at end of file diff --git a/ots/CMakeLists.txt b/ots/CMakeLists.txt index 4d7f5ed90..792735164 100644 --- a/ots/CMakeLists.txt +++ b/ots/CMakeLists.txt @@ -39,10 +39,10 @@ set(ots_public_header_model include/alibabacloud/ots/model/InsertInstanceResult.h include/alibabacloud/ots/model/ListTagsRequest.h include/alibabacloud/ots/model/ListTagsResult.h - include/alibabacloud/ots/model/ListVpcInfoByInstanceRequest.h - include/alibabacloud/ots/model/ListVpcInfoByInstanceResult.h include/alibabacloud/ots/model/InsertTagsRequest.h include/alibabacloud/ots/model/InsertTagsResult.h + include/alibabacloud/ots/model/ListVpcInfoByInstanceRequest.h + include/alibabacloud/ots/model/ListVpcInfoByInstanceResult.h include/alibabacloud/ots/model/DeleteTagsRequest.h include/alibabacloud/ots/model/DeleteTagsResult.h include/alibabacloud/ots/model/DeleteInstanceRequest.h @@ -68,10 +68,10 @@ set(ots_src src/model/InsertInstanceResult.cc src/model/ListTagsRequest.cc src/model/ListTagsResult.cc - src/model/ListVpcInfoByInstanceRequest.cc - src/model/ListVpcInfoByInstanceResult.cc src/model/InsertTagsRequest.cc src/model/InsertTagsResult.cc + src/model/ListVpcInfoByInstanceRequest.cc + src/model/ListVpcInfoByInstanceResult.cc src/model/DeleteTagsRequest.cc src/model/DeleteTagsResult.cc src/model/DeleteInstanceRequest.cc diff --git a/ots/include/alibabacloud/ots/OtsClient.h b/ots/include/alibabacloud/ots/OtsClient.h index 611616a44..a51c41647 100644 --- a/ots/include/alibabacloud/ots/OtsClient.h +++ b/ots/include/alibabacloud/ots/OtsClient.h @@ -40,10 +40,10 @@ #include "model/InsertInstanceResult.h" #include "model/ListTagsRequest.h" #include "model/ListTagsResult.h" -#include "model/ListVpcInfoByInstanceRequest.h" -#include "model/ListVpcInfoByInstanceResult.h" #include "model/InsertTagsRequest.h" #include "model/InsertTagsResult.h" +#include "model/ListVpcInfoByInstanceRequest.h" +#include "model/ListVpcInfoByInstanceResult.h" #include "model/DeleteTagsRequest.h" #include "model/DeleteTagsResult.h" #include "model/DeleteInstanceRequest.h" @@ -84,12 +84,12 @@ namespace AlibabaCloud typedef Outcome ListTagsOutcome; typedef std::future ListTagsOutcomeCallable; typedef std::function&)> ListTagsAsyncHandler; - typedef Outcome ListVpcInfoByInstanceOutcome; - typedef std::future ListVpcInfoByInstanceOutcomeCallable; - typedef std::function&)> ListVpcInfoByInstanceAsyncHandler; typedef Outcome InsertTagsOutcome; typedef std::future InsertTagsOutcomeCallable; typedef std::function&)> InsertTagsAsyncHandler; + typedef Outcome ListVpcInfoByInstanceOutcome; + typedef std::future ListVpcInfoByInstanceOutcomeCallable; + typedef std::function&)> ListVpcInfoByInstanceAsyncHandler; typedef Outcome DeleteTagsOutcome; typedef std::future DeleteTagsOutcomeCallable; typedef std::function&)> DeleteTagsAsyncHandler; @@ -128,12 +128,12 @@ namespace AlibabaCloud ListTagsOutcome listTags(const Model::ListTagsRequest &request)const; void listTagsAsync(const Model::ListTagsRequest& request, const ListTagsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ListTagsOutcomeCallable listTagsCallable(const Model::ListTagsRequest& request) const; - ListVpcInfoByInstanceOutcome listVpcInfoByInstance(const Model::ListVpcInfoByInstanceRequest &request)const; - void listVpcInfoByInstanceAsync(const Model::ListVpcInfoByInstanceRequest& request, const ListVpcInfoByInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - ListVpcInfoByInstanceOutcomeCallable listVpcInfoByInstanceCallable(const Model::ListVpcInfoByInstanceRequest& request) const; InsertTagsOutcome insertTags(const Model::InsertTagsRequest &request)const; void insertTagsAsync(const Model::InsertTagsRequest& request, const InsertTagsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; InsertTagsOutcomeCallable insertTagsCallable(const Model::InsertTagsRequest& request) const; + ListVpcInfoByInstanceOutcome listVpcInfoByInstance(const Model::ListVpcInfoByInstanceRequest &request)const; + void listVpcInfoByInstanceAsync(const Model::ListVpcInfoByInstanceRequest& request, const ListVpcInfoByInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + ListVpcInfoByInstanceOutcomeCallable listVpcInfoByInstanceCallable(const Model::ListVpcInfoByInstanceRequest& request) const; DeleteTagsOutcome deleteTags(const Model::DeleteTagsRequest &request)const; void deleteTagsAsync(const Model::DeleteTagsRequest& request, const DeleteTagsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteTagsOutcomeCallable deleteTagsCallable(const Model::DeleteTagsRequest& request) const; diff --git a/ots/include/alibabacloud/ots/model/DeleteTagsRequest.h b/ots/include/alibabacloud/ots/model/DeleteTagsRequest.h index 5b2a6bef3..a70cbcdbd 100644 --- a/ots/include/alibabacloud/ots/model/DeleteTagsRequest.h +++ b/ots/include/alibabacloud/ots/model/DeleteTagsRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/include/alibabacloud/ots/model/InsertInstanceRequest.h b/ots/include/alibabacloud/ots/model/InsertInstanceRequest.h index 418b0ce1c..a870d7af9 100644 --- a/ots/include/alibabacloud/ots/model/InsertInstanceRequest.h +++ b/ots/include/alibabacloud/ots/model/InsertInstanceRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/include/alibabacloud/ots/model/InsertTagsRequest.h b/ots/include/alibabacloud/ots/model/InsertTagsRequest.h index d2e7e7dc8..05adb1bd6 100644 --- a/ots/include/alibabacloud/ots/model/InsertTagsRequest.h +++ b/ots/include/alibabacloud/ots/model/InsertTagsRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/include/alibabacloud/ots/model/ListInstanceRequest.h b/ots/include/alibabacloud/ots/model/ListInstanceRequest.h index 9cd7f5cd9..faa6d77fb 100644 --- a/ots/include/alibabacloud/ots/model/ListInstanceRequest.h +++ b/ots/include/alibabacloud/ots/model/ListInstanceRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/include/alibabacloud/ots/model/ListTagsRequest.h b/ots/include/alibabacloud/ots/model/ListTagsRequest.h index 4694e6d2e..38dc3c03e 100644 --- a/ots/include/alibabacloud/ots/model/ListTagsRequest.h +++ b/ots/include/alibabacloud/ots/model/ListTagsRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/include/alibabacloud/ots/model/ListVpcInfoByVpcRequest.h b/ots/include/alibabacloud/ots/model/ListVpcInfoByVpcRequest.h index c8c6ec8e3..e1d7fe91c 100644 --- a/ots/include/alibabacloud/ots/model/ListVpcInfoByVpcRequest.h +++ b/ots/include/alibabacloud/ots/model/ListVpcInfoByVpcRequest.h @@ -32,8 +32,8 @@ namespace AlibabaCloud { struct TagInfo { - std::string tagKey; std::string tagValue; + std::string tagKey; }; public: diff --git a/ots/src/OtsClient.cc b/ots/src/OtsClient.cc index 567a9a47a..542528d35 100644 --- a/ots/src/OtsClient.cc +++ b/ots/src/OtsClient.cc @@ -375,42 +375,6 @@ OtsClient::ListTagsOutcomeCallable OtsClient::listTagsCallable(const ListTagsReq return task->get_future(); } -OtsClient::ListVpcInfoByInstanceOutcome OtsClient::listVpcInfoByInstance(const ListVpcInfoByInstanceRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return ListVpcInfoByInstanceOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return ListVpcInfoByInstanceOutcome(ListVpcInfoByInstanceResult(outcome.result())); - else - return ListVpcInfoByInstanceOutcome(outcome.error()); -} - -void OtsClient::listVpcInfoByInstanceAsync(const ListVpcInfoByInstanceRequest& request, const ListVpcInfoByInstanceAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, listVpcInfoByInstance(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -OtsClient::ListVpcInfoByInstanceOutcomeCallable OtsClient::listVpcInfoByInstanceCallable(const ListVpcInfoByInstanceRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->listVpcInfoByInstance(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - OtsClient::InsertTagsOutcome OtsClient::insertTags(const InsertTagsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -447,6 +411,42 @@ OtsClient::InsertTagsOutcomeCallable OtsClient::insertTagsCallable(const InsertT return task->get_future(); } +OtsClient::ListVpcInfoByInstanceOutcome OtsClient::listVpcInfoByInstance(const ListVpcInfoByInstanceRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return ListVpcInfoByInstanceOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return ListVpcInfoByInstanceOutcome(ListVpcInfoByInstanceResult(outcome.result())); + else + return ListVpcInfoByInstanceOutcome(outcome.error()); +} + +void OtsClient::listVpcInfoByInstanceAsync(const ListVpcInfoByInstanceRequest& request, const ListVpcInfoByInstanceAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, listVpcInfoByInstance(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +OtsClient::ListVpcInfoByInstanceOutcomeCallable OtsClient::listVpcInfoByInstanceCallable(const ListVpcInfoByInstanceRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->listVpcInfoByInstance(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + OtsClient::DeleteTagsOutcome OtsClient::deleteTags(const DeleteTagsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/ots/src/model/DeleteTagsRequest.cc b/ots/src/model/DeleteTagsRequest.cc index 373e1608e..454c44007 100644 --- a/ots/src/model/DeleteTagsRequest.cc +++ b/ots/src/model/DeleteTagsRequest.cc @@ -70,8 +70,8 @@ void DeleteTagsRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } } diff --git a/ots/src/model/InsertInstanceRequest.cc b/ots/src/model/InsertInstanceRequest.cc index 8da08d991..af2425b3e 100644 --- a/ots/src/model/InsertInstanceRequest.cc +++ b/ots/src/model/InsertInstanceRequest.cc @@ -92,8 +92,8 @@ void InsertInstanceRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } } diff --git a/ots/src/model/InsertTagsRequest.cc b/ots/src/model/InsertTagsRequest.cc index ad87f89f5..c16dc00b8 100644 --- a/ots/src/model/InsertTagsRequest.cc +++ b/ots/src/model/InsertTagsRequest.cc @@ -70,8 +70,8 @@ void InsertTagsRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } } diff --git a/ots/src/model/ListInstanceRequest.cc b/ots/src/model/ListInstanceRequest.cc index aa27cb649..2dc710d73 100644 --- a/ots/src/model/ListInstanceRequest.cc +++ b/ots/src/model/ListInstanceRequest.cc @@ -81,8 +81,8 @@ void ListInstanceRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } } diff --git a/ots/src/model/ListTagsRequest.cc b/ots/src/model/ListTagsRequest.cc index 084e239da..2aca3f2d7 100644 --- a/ots/src/model/ListTagsRequest.cc +++ b/ots/src/model/ListTagsRequest.cc @@ -92,8 +92,8 @@ void ListTagsRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } } diff --git a/ots/src/model/ListVpcInfoByVpcRequest.cc b/ots/src/model/ListVpcInfoByVpcRequest.cc index f2b810478..cebad7daf 100644 --- a/ots/src/model/ListVpcInfoByVpcRequest.cc +++ b/ots/src/model/ListVpcInfoByVpcRequest.cc @@ -92,8 +92,8 @@ void ListVpcInfoByVpcRequest::setTagInfo(const std::vector& tagInfo) for(int i = 0; i!= tagInfo.size(); i++) { auto obj = tagInfo.at(i); std::string str ="TagInfo."+ std::to_string(i); - setParameter(str + ".TagKey", obj.tagKey); setParameter(str + ".TagValue", obj.tagValue); + setParameter(str + ".TagKey", obj.tagKey); } }