diff --git a/CHANGELOG b/CHANGELOG index c172f91a4..6279150fe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +2020-02-24 Version: 1.36.286 +- ImmediateDelete. +- DescribeInstance CreateTimeUTC ExpireTimeUTC. +- DescribeInstances CreateTimeUTC ExpireTimeUTC. +- DescribeIpWhitelist Groups GroupName. +- CreateCluster. + 2020-02-24 Version: 1.36.285 - Release Ft SDK. diff --git a/VERSION b/VERSION index 446a6ecc5..6db420787 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.285 \ No newline at end of file +1.36.286 \ No newline at end of file diff --git a/hbase/CMakeLists.txt b/hbase/CMakeLists.txt index 8f7227ead..1938d59d5 100644 --- a/hbase/CMakeLists.txt +++ b/hbase/CMakeLists.txt @@ -25,6 +25,8 @@ set(hbase_public_header_model include/alibabacloud/hbase/model/AddUserHdfsInfoResult.h include/alibabacloud/hbase/model/ConvertInstanceRequest.h include/alibabacloud/hbase/model/ConvertInstanceResult.h + include/alibabacloud/hbase/model/CreateClusterRequest.h + include/alibabacloud/hbase/model/CreateClusterResult.h include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h include/alibabacloud/hbase/model/CreateHbaseHaSlbResult.h include/alibabacloud/hbase/model/CreateInstanceRequest.h @@ -55,6 +57,8 @@ set(hbase_public_header_model include/alibabacloud/hbase/model/ListTagResourcesResult.h include/alibabacloud/hbase/model/ListTagsRequest.h include/alibabacloud/hbase/model/ListTagsResult.h + include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionRequest.h + include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionResult.h include/alibabacloud/hbase/model/ModifyInstanceMaintainTimeRequest.h include/alibabacloud/hbase/model/ModifyInstanceMaintainTimeResult.h include/alibabacloud/hbase/model/ModifyInstanceNameRequest.h @@ -92,6 +96,8 @@ set(hbase_src src/model/AddUserHdfsInfoResult.cc src/model/ConvertInstanceRequest.cc src/model/ConvertInstanceResult.cc + src/model/CreateClusterRequest.cc + src/model/CreateClusterResult.cc src/model/CreateHbaseHaSlbRequest.cc src/model/CreateHbaseHaSlbResult.cc src/model/CreateInstanceRequest.cc @@ -122,6 +128,8 @@ set(hbase_src src/model/ListTagResourcesResult.cc src/model/ListTagsRequest.cc src/model/ListTagsResult.cc + src/model/ModifyClusterDeletionProtectionRequest.cc + src/model/ModifyClusterDeletionProtectionResult.cc src/model/ModifyInstanceMaintainTimeRequest.cc src/model/ModifyInstanceMaintainTimeResult.cc src/model/ModifyInstanceNameRequest.cc diff --git a/hbase/include/alibabacloud/hbase/HBaseClient.h b/hbase/include/alibabacloud/hbase/HBaseClient.h index fdfe0d5d2..3e0fe7e10 100644 --- a/hbase/include/alibabacloud/hbase/HBaseClient.h +++ b/hbase/include/alibabacloud/hbase/HBaseClient.h @@ -26,6 +26,8 @@ #include "model/AddUserHdfsInfoResult.h" #include "model/ConvertInstanceRequest.h" #include "model/ConvertInstanceResult.h" +#include "model/CreateClusterRequest.h" +#include "model/CreateClusterResult.h" #include "model/CreateHbaseHaSlbRequest.h" #include "model/CreateHbaseHaSlbResult.h" #include "model/CreateInstanceRequest.h" @@ -56,6 +58,8 @@ #include "model/ListTagResourcesResult.h" #include "model/ListTagsRequest.h" #include "model/ListTagsResult.h" +#include "model/ModifyClusterDeletionProtectionRequest.h" +#include "model/ModifyClusterDeletionProtectionResult.h" #include "model/ModifyInstanceMaintainTimeRequest.h" #include "model/ModifyInstanceMaintainTimeResult.h" #include "model/ModifyInstanceNameRequest.h" @@ -101,6 +105,9 @@ namespace AlibabaCloud typedef Outcome ConvertInstanceOutcome; typedef std::future ConvertInstanceOutcomeCallable; typedef std::function&)> ConvertInstanceAsyncHandler; + typedef Outcome CreateClusterOutcome; + typedef std::future CreateClusterOutcomeCallable; + typedef std::function&)> CreateClusterAsyncHandler; typedef Outcome CreateHbaseHaSlbOutcome; typedef std::future CreateHbaseHaSlbOutcomeCallable; typedef std::function&)> CreateHbaseHaSlbAsyncHandler; @@ -146,6 +153,9 @@ namespace AlibabaCloud typedef Outcome ListTagsOutcome; typedef std::future ListTagsOutcomeCallable; typedef std::function&)> ListTagsAsyncHandler; + typedef Outcome ModifyClusterDeletionProtectionOutcome; + typedef std::future ModifyClusterDeletionProtectionOutcomeCallable; + typedef std::function&)> ModifyClusterDeletionProtectionAsyncHandler; typedef Outcome ModifyInstanceMaintainTimeOutcome; typedef std::future ModifyInstanceMaintainTimeOutcomeCallable; typedef std::function&)> ModifyInstanceMaintainTimeAsyncHandler; @@ -202,6 +212,9 @@ namespace AlibabaCloud ConvertInstanceOutcome convertInstance(const Model::ConvertInstanceRequest &request)const; void convertInstanceAsync(const Model::ConvertInstanceRequest& request, const ConvertInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ConvertInstanceOutcomeCallable convertInstanceCallable(const Model::ConvertInstanceRequest& request) const; + CreateClusterOutcome createCluster(const Model::CreateClusterRequest &request)const; + void createClusterAsync(const Model::CreateClusterRequest& request, const CreateClusterAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + CreateClusterOutcomeCallable createClusterCallable(const Model::CreateClusterRequest& request) const; CreateHbaseHaSlbOutcome createHbaseHaSlb(const Model::CreateHbaseHaSlbRequest &request)const; void createHbaseHaSlbAsync(const Model::CreateHbaseHaSlbRequest& request, const CreateHbaseHaSlbAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; CreateHbaseHaSlbOutcomeCallable createHbaseHaSlbCallable(const Model::CreateHbaseHaSlbRequest& request) const; @@ -247,6 +260,9 @@ 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; + ModifyClusterDeletionProtectionOutcome modifyClusterDeletionProtection(const Model::ModifyClusterDeletionProtectionRequest &request)const; + void modifyClusterDeletionProtectionAsync(const Model::ModifyClusterDeletionProtectionRequest& request, const ModifyClusterDeletionProtectionAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + ModifyClusterDeletionProtectionOutcomeCallable modifyClusterDeletionProtectionCallable(const Model::ModifyClusterDeletionProtectionRequest& request) const; ModifyInstanceMaintainTimeOutcome modifyInstanceMaintainTime(const Model::ModifyInstanceMaintainTimeRequest &request)const; void modifyInstanceMaintainTimeAsync(const Model::ModifyInstanceMaintainTimeRequest& request, const ModifyInstanceMaintainTimeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyInstanceMaintainTimeOutcomeCallable modifyInstanceMaintainTimeCallable(const Model::ModifyInstanceMaintainTimeRequest& request) const; diff --git a/hbase/include/alibabacloud/hbase/model/CreateClusterRequest.h b/hbase/include/alibabacloud/hbase/model/CreateClusterRequest.h new file mode 100644 index 000000000..29db1168e --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/CreateClusterRequest.h @@ -0,0 +1,102 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERREQUEST_H_ +#define ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT CreateClusterRequest : public RpcServiceRequest + { + + public: + CreateClusterRequest(); + ~CreateClusterRequest(); + + std::string getClusterName()const; + void setClusterName(const std::string& clusterName); + std::string getClientToken()const; + void setClientToken(const std::string& clientToken); + std::string getEngineVersion()const; + void setEngineVersion(const std::string& engineVersion); + std::string getRegionId()const; + void setRegionId(const std::string& regionId); + std::string getEngine()const; + void setEngine(const std::string& engine); + int getAutoRenewPeriod()const; + void setAutoRenewPeriod(int autoRenewPeriod); + int getPeriod()const; + void setPeriod(int period); + int getDiskSize()const; + void setDiskSize(int diskSize); + std::string getMasterInstanceType()const; + void setMasterInstanceType(const std::string& masterInstanceType); + std::string getDiskType()const; + void setDiskType(const std::string& diskType); + std::string getVSwitchId()const; + void setVSwitchId(const std::string& vSwitchId); + std::string getSecurityIPList()const; + void setSecurityIPList(const std::string& securityIPList); + int getColdStorageSize()const; + void setColdStorageSize(int coldStorageSize); + std::string getPeriodUnit()const; + void setPeriodUnit(const std::string& periodUnit); + std::string getCoreInstanceType()const; + void setCoreInstanceType(const std::string& coreInstanceType); + std::string getVpcId()const; + void setVpcId(const std::string& vpcId); + int getNodeCount()const; + void setNodeCount(int nodeCount); + std::string getZoneId()const; + void setZoneId(const std::string& zoneId); + std::string getPayType()const; + void setPayType(const std::string& payType); + + private: + std::string clusterName_; + std::string clientToken_; + std::string engineVersion_; + std::string regionId_; + std::string engine_; + int autoRenewPeriod_; + int period_; + int diskSize_; + std::string masterInstanceType_; + std::string diskType_; + std::string vSwitchId_; + std::string securityIPList_; + int coldStorageSize_; + std::string periodUnit_; + std::string coreInstanceType_; + std::string vpcId_; + int nodeCount_; + std::string zoneId_; + std::string payType_; + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERREQUEST_H_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/CreateClusterResult.h b/hbase/include/alibabacloud/hbase/model/CreateClusterResult.h new file mode 100644 index 000000000..d93745bef --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/CreateClusterResult.h @@ -0,0 +1,53 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERRESULT_H_ +#define ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT CreateClusterResult : public ServiceResult + { + public: + + + CreateClusterResult(); + explicit CreateClusterResult(const std::string &payload); + ~CreateClusterResult(); + std::string getClusterId()const; + std::string getOrderId()const; + + protected: + void parse(const std::string &payload); + private: + std::string clusterId_; + std::string orderId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_CREATECLUSTERRESULT_H_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h index 706a2d30a..10562a05b 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h @@ -45,9 +45,12 @@ namespace AlibabaCloud bool getIsHa()const; std::string getCreatedTime()const; std::string getMasterInstanceType()const; + bool getIsDeletionProtection()const; + bool getIsLatestVersion()const; std::string getMaintainEndTime()const; std::string getNetworkType()const; std::string getCoreInstanceType()const; + std::string getClusterName()const; std::string getMasterDiskType()const; std::vector getTags()const; std::string getEngine()const; @@ -60,10 +63,13 @@ namespace AlibabaCloud std::string getZoneId()const; std::string getInstanceId()const; int getCoreNodeCount()const; + std::string getClusterId()const; std::string getColdStorageStatus()const; std::string getMinorVersion()const; std::string getCreatedTimeUTC()const; std::string getPayType()const; + bool getIsMultiModel()const; + std::string getClusterType()const; std::string getVswitchId()const; std::string getInstanceName()const; int getMasterNodeCount()const; @@ -80,9 +86,12 @@ namespace AlibabaCloud bool isHa_; std::string createdTime_; std::string masterInstanceType_; + bool isDeletionProtection_; + bool isLatestVersion_; std::string maintainEndTime_; std::string networkType_; std::string coreInstanceType_; + std::string clusterName_; std::string masterDiskType_; std::vector tags_; std::string engine_; @@ -95,10 +104,13 @@ namespace AlibabaCloud std::string zoneId_; std::string instanceId_; int coreNodeCount_; + std::string clusterId_; std::string coldStorageStatus_; std::string minorVersion_; std::string createdTimeUTC_; std::string payType_; + bool isMultiModel_; + std::string clusterType_; std::string vswitchId_; std::string instanceName_; int masterNodeCount_; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstancesRequest.h b/hbase/include/alibabacloud/hbase/model/DescribeInstancesRequest.h index d8c36e039..56f0f59ca 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstancesRequest.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstancesRequest.h @@ -30,6 +30,7 @@ namespace AlibabaCloud { class ALIBABACLOUD_HBASE_EXPORT DescribeInstancesRequest : public RpcServiceRequest { + public: struct Tag { std::string value; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h b/hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h index d4ca63284..cfbe69f81 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h @@ -42,8 +42,10 @@ namespace AlibabaCloud bool isHa; std::string createdTime; std::string masterInstanceType; + bool isDeletionProtection; std::string networkType; std::string coreInstanceType; + std::string clusterName; std::string masterDiskType; std::vector tags; std::string engine; @@ -54,6 +56,7 @@ namespace AlibabaCloud std::string zoneId; std::string instanceId; int coreNodeCount; + std::string clusterId; std::string coldStorageStatus; std::string createdTimeUTC; std::string payType; diff --git a/hbase/include/alibabacloud/hbase/model/ListTagResourcesRequest.h b/hbase/include/alibabacloud/hbase/model/ListTagResourcesRequest.h index 55ec6eaf6..90e78be8e 100644 --- a/hbase/include/alibabacloud/hbase/model/ListTagResourcesRequest.h +++ b/hbase/include/alibabacloud/hbase/model/ListTagResourcesRequest.h @@ -30,6 +30,7 @@ namespace AlibabaCloud { class ALIBABACLOUD_HBASE_EXPORT ListTagResourcesRequest : public RpcServiceRequest { + public: struct Tag { std::string value; diff --git a/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionRequest.h b/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionRequest.h new file mode 100644 index 000000000..f2edb3313 --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionRequest.h @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONREQUEST_H_ +#define ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT ModifyClusterDeletionProtectionRequest : public RpcServiceRequest + { + + public: + ModifyClusterDeletionProtectionRequest(); + ~ModifyClusterDeletionProtectionRequest(); + + bool getProtection()const; + void setProtection(bool protection); + std::string getClusterId()const; + void setClusterId(const std::string& clusterId); + + private: + bool protection_; + std::string clusterId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONREQUEST_H_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionResult.h b/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionResult.h new file mode 100644 index 000000000..d278c5c3d --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/ModifyClusterDeletionProtectionResult.h @@ -0,0 +1,49 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONRESULT_H_ +#define ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT ModifyClusterDeletionProtectionResult : public ServiceResult + { + public: + + + ModifyClusterDeletionProtectionResult(); + explicit ModifyClusterDeletionProtectionResult(const std::string &payload); + ~ModifyClusterDeletionProtectionResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_MODIFYCLUSTERDELETIONPROTECTIONRESULT_H_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/QueryXpackRelateDBRequest.h b/hbase/include/alibabacloud/hbase/model/QueryXpackRelateDBRequest.h index 7e426ba92..073933f4c 100644 --- a/hbase/include/alibabacloud/hbase/model/QueryXpackRelateDBRequest.h +++ b/hbase/include/alibabacloud/hbase/model/QueryXpackRelateDBRequest.h @@ -35,12 +35,15 @@ namespace AlibabaCloud QueryXpackRelateDBRequest(); ~QueryXpackRelateDBRequest(); + bool getHasSingleNode()const; + void setHasSingleNode(bool hasSingleNode); std::string getClusterId()const; void setClusterId(const std::string& clusterId); std::string getRelateDbType()const; void setRelateDbType(const std::string& relateDbType); private: + bool hasSingleNode_; std::string clusterId_; std::string relateDbType_; diff --git a/hbase/include/alibabacloud/hbase/model/TagResourcesRequest.h b/hbase/include/alibabacloud/hbase/model/TagResourcesRequest.h index ebb22255e..9cc8391f5 100644 --- a/hbase/include/alibabacloud/hbase/model/TagResourcesRequest.h +++ b/hbase/include/alibabacloud/hbase/model/TagResourcesRequest.h @@ -30,6 +30,7 @@ namespace AlibabaCloud { class ALIBABACLOUD_HBASE_EXPORT TagResourcesRequest : public RpcServiceRequest { + public: struct Tag { std::string value; diff --git a/hbase/src/HBaseClient.cc b/hbase/src/HBaseClient.cc index d1d7f6e8d..3cf2850a1 100644 --- a/hbase/src/HBaseClient.cc +++ b/hbase/src/HBaseClient.cc @@ -31,21 +31,21 @@ HBaseClient::HBaseClient(const Credentials &credentials, const ClientConfigurati RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "hbase"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } HBaseClient::HBaseClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "hbase"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } HBaseClient::HBaseClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "hbase"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } HBaseClient::~HBaseClient() @@ -123,6 +123,42 @@ HBaseClient::ConvertInstanceOutcomeCallable HBaseClient::convertInstanceCallable return task->get_future(); } +HBaseClient::CreateClusterOutcome HBaseClient::createCluster(const CreateClusterRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return CreateClusterOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return CreateClusterOutcome(CreateClusterResult(outcome.result())); + else + return CreateClusterOutcome(outcome.error()); +} + +void HBaseClient::createClusterAsync(const CreateClusterRequest& request, const CreateClusterAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, createCluster(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +HBaseClient::CreateClusterOutcomeCallable HBaseClient::createClusterCallable(const CreateClusterRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->createCluster(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + HBaseClient::CreateHbaseHaSlbOutcome HBaseClient::createHbaseHaSlb(const CreateHbaseHaSlbRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -663,6 +699,42 @@ HBaseClient::ListTagsOutcomeCallable HBaseClient::listTagsCallable(const ListTag return task->get_future(); } +HBaseClient::ModifyClusterDeletionProtectionOutcome HBaseClient::modifyClusterDeletionProtection(const ModifyClusterDeletionProtectionRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return ModifyClusterDeletionProtectionOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return ModifyClusterDeletionProtectionOutcome(ModifyClusterDeletionProtectionResult(outcome.result())); + else + return ModifyClusterDeletionProtectionOutcome(outcome.error()); +} + +void HBaseClient::modifyClusterDeletionProtectionAsync(const ModifyClusterDeletionProtectionRequest& request, const ModifyClusterDeletionProtectionAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, modifyClusterDeletionProtection(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +HBaseClient::ModifyClusterDeletionProtectionOutcomeCallable HBaseClient::modifyClusterDeletionProtectionCallable(const ModifyClusterDeletionProtectionRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->modifyClusterDeletionProtection(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + HBaseClient::ModifyInstanceMaintainTimeOutcome HBaseClient::modifyInstanceMaintainTime(const ModifyInstanceMaintainTimeRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/hbase/src/model/AddUserHdfsInfoRequest.cc b/hbase/src/model/AddUserHdfsInfoRequest.cc index dbf0f0475..6f1800f98 100644 --- a/hbase/src/model/AddUserHdfsInfoRequest.cc +++ b/hbase/src/model/AddUserHdfsInfoRequest.cc @@ -35,7 +35,7 @@ std::string AddUserHdfsInfoRequest::getExtInfo()const void AddUserHdfsInfoRequest::setExtInfo(const std::string& extInfo) { extInfo_ = extInfo; - setCoreParameter("ExtInfo", extInfo); + setParameter("ExtInfo", extInfo); } std::string AddUserHdfsInfoRequest::getClusterId()const @@ -46,6 +46,6 @@ std::string AddUserHdfsInfoRequest::getClusterId()const void AddUserHdfsInfoRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/ConvertInstanceRequest.cc b/hbase/src/model/ConvertInstanceRequest.cc index baaf2ad02..e6a7c0f66 100644 --- a/hbase/src/model/ConvertInstanceRequest.cc +++ b/hbase/src/model/ConvertInstanceRequest.cc @@ -35,7 +35,7 @@ std::string ConvertInstanceRequest::getClusterId()const void ConvertInstanceRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } int ConvertInstanceRequest::getDuration()const @@ -46,7 +46,7 @@ int ConvertInstanceRequest::getDuration()const void ConvertInstanceRequest::setDuration(int duration) { duration_ = duration; - setCoreParameter("Duration", std::to_string(duration)); + setParameter("Duration", std::to_string(duration)); } std::string ConvertInstanceRequest::getPricingCycle()const @@ -57,6 +57,6 @@ std::string ConvertInstanceRequest::getPricingCycle()const void ConvertInstanceRequest::setPricingCycle(const std::string& pricingCycle) { pricingCycle_ = pricingCycle; - setCoreParameter("PricingCycle", pricingCycle); + setParameter("PricingCycle", pricingCycle); } diff --git a/hbase/src/model/CreateClusterRequest.cc b/hbase/src/model/CreateClusterRequest.cc new file mode 100644 index 000000000..208c498e5 --- /dev/null +++ b/hbase/src/model/CreateClusterRequest.cc @@ -0,0 +1,238 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::HBase::Model::CreateClusterRequest; + +CreateClusterRequest::CreateClusterRequest() : + RpcServiceRequest("hbase", "2019-01-01", "CreateCluster") +{ + setMethod(HttpRequest::Method::Post); +} + +CreateClusterRequest::~CreateClusterRequest() +{} + +std::string CreateClusterRequest::getClusterName()const +{ + return clusterName_; +} + +void CreateClusterRequest::setClusterName(const std::string& clusterName) +{ + clusterName_ = clusterName; + setParameter("ClusterName", clusterName); +} + +std::string CreateClusterRequest::getClientToken()const +{ + return clientToken_; +} + +void CreateClusterRequest::setClientToken(const std::string& clientToken) +{ + clientToken_ = clientToken; + setParameter("ClientToken", clientToken); +} + +std::string CreateClusterRequest::getEngineVersion()const +{ + return engineVersion_; +} + +void CreateClusterRequest::setEngineVersion(const std::string& engineVersion) +{ + engineVersion_ = engineVersion; + setParameter("EngineVersion", engineVersion); +} + +std::string CreateClusterRequest::getRegionId()const +{ + return regionId_; +} + +void CreateClusterRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +std::string CreateClusterRequest::getEngine()const +{ + return engine_; +} + +void CreateClusterRequest::setEngine(const std::string& engine) +{ + engine_ = engine; + setParameter("Engine", engine); +} + +int CreateClusterRequest::getAutoRenewPeriod()const +{ + return autoRenewPeriod_; +} + +void CreateClusterRequest::setAutoRenewPeriod(int autoRenewPeriod) +{ + autoRenewPeriod_ = autoRenewPeriod; + setParameter("AutoRenewPeriod", std::to_string(autoRenewPeriod)); +} + +int CreateClusterRequest::getPeriod()const +{ + return period_; +} + +void CreateClusterRequest::setPeriod(int period) +{ + period_ = period; + setParameter("Period", std::to_string(period)); +} + +int CreateClusterRequest::getDiskSize()const +{ + return diskSize_; +} + +void CreateClusterRequest::setDiskSize(int diskSize) +{ + diskSize_ = diskSize; + setParameter("DiskSize", std::to_string(diskSize)); +} + +std::string CreateClusterRequest::getMasterInstanceType()const +{ + return masterInstanceType_; +} + +void CreateClusterRequest::setMasterInstanceType(const std::string& masterInstanceType) +{ + masterInstanceType_ = masterInstanceType; + setParameter("MasterInstanceType", masterInstanceType); +} + +std::string CreateClusterRequest::getDiskType()const +{ + return diskType_; +} + +void CreateClusterRequest::setDiskType(const std::string& diskType) +{ + diskType_ = diskType; + setParameter("DiskType", diskType); +} + +std::string CreateClusterRequest::getVSwitchId()const +{ + return vSwitchId_; +} + +void CreateClusterRequest::setVSwitchId(const std::string& vSwitchId) +{ + vSwitchId_ = vSwitchId; + setParameter("VSwitchId", vSwitchId); +} + +std::string CreateClusterRequest::getSecurityIPList()const +{ + return securityIPList_; +} + +void CreateClusterRequest::setSecurityIPList(const std::string& securityIPList) +{ + securityIPList_ = securityIPList; + setParameter("SecurityIPList", securityIPList); +} + +int CreateClusterRequest::getColdStorageSize()const +{ + return coldStorageSize_; +} + +void CreateClusterRequest::setColdStorageSize(int coldStorageSize) +{ + coldStorageSize_ = coldStorageSize; + setParameter("ColdStorageSize", std::to_string(coldStorageSize)); +} + +std::string CreateClusterRequest::getPeriodUnit()const +{ + return periodUnit_; +} + +void CreateClusterRequest::setPeriodUnit(const std::string& periodUnit) +{ + periodUnit_ = periodUnit; + setParameter("PeriodUnit", periodUnit); +} + +std::string CreateClusterRequest::getCoreInstanceType()const +{ + return coreInstanceType_; +} + +void CreateClusterRequest::setCoreInstanceType(const std::string& coreInstanceType) +{ + coreInstanceType_ = coreInstanceType; + setParameter("CoreInstanceType", coreInstanceType); +} + +std::string CreateClusterRequest::getVpcId()const +{ + return vpcId_; +} + +void CreateClusterRequest::setVpcId(const std::string& vpcId) +{ + vpcId_ = vpcId; + setParameter("VpcId", vpcId); +} + +int CreateClusterRequest::getNodeCount()const +{ + return nodeCount_; +} + +void CreateClusterRequest::setNodeCount(int nodeCount) +{ + nodeCount_ = nodeCount; + setParameter("NodeCount", std::to_string(nodeCount)); +} + +std::string CreateClusterRequest::getZoneId()const +{ + return zoneId_; +} + +void CreateClusterRequest::setZoneId(const std::string& zoneId) +{ + zoneId_ = zoneId; + setParameter("ZoneId", zoneId); +} + +std::string CreateClusterRequest::getPayType()const +{ + return payType_; +} + +void CreateClusterRequest::setPayType(const std::string& payType) +{ + payType_ = payType; + setParameter("PayType", payType); +} + diff --git a/hbase/src/model/CreateClusterResult.cc b/hbase/src/model/CreateClusterResult.cc new file mode 100644 index 000000000..3acdf65a3 --- /dev/null +++ b/hbase/src/model/CreateClusterResult.cc @@ -0,0 +1,58 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::HBase; +using namespace AlibabaCloud::HBase::Model; + +CreateClusterResult::CreateClusterResult() : + ServiceResult() +{} + +CreateClusterResult::CreateClusterResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +CreateClusterResult::~CreateClusterResult() +{} + +void CreateClusterResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["ClusterId"].isNull()) + clusterId_ = value["ClusterId"].asString(); + if(!value["OrderId"].isNull()) + orderId_ = value["OrderId"].asString(); + +} + +std::string CreateClusterResult::getClusterId()const +{ + return clusterId_; +} + +std::string CreateClusterResult::getOrderId()const +{ + return orderId_; +} + diff --git a/hbase/src/model/CreateHbaseHaSlbRequest.cc b/hbase/src/model/CreateHbaseHaSlbRequest.cc index bae33c6e6..90072fb5f 100644 --- a/hbase/src/model/CreateHbaseHaSlbRequest.cc +++ b/hbase/src/model/CreateHbaseHaSlbRequest.cc @@ -35,7 +35,7 @@ std::string CreateHbaseHaSlbRequest::getHaTypes()const void CreateHbaseHaSlbRequest::setHaTypes(const std::string& haTypes) { haTypes_ = haTypes; - setCoreParameter("HaTypes", haTypes); + setParameter("HaTypes", haTypes); } std::string CreateHbaseHaSlbRequest::getHbaseType()const @@ -46,7 +46,7 @@ std::string CreateHbaseHaSlbRequest::getHbaseType()const void CreateHbaseHaSlbRequest::setHbaseType(const std::string& hbaseType) { hbaseType_ = hbaseType; - setCoreParameter("HbaseType", hbaseType); + setParameter("HbaseType", hbaseType); } std::string CreateHbaseHaSlbRequest::getBdsId()const @@ -57,7 +57,7 @@ std::string CreateHbaseHaSlbRequest::getBdsId()const void CreateHbaseHaSlbRequest::setBdsId(const std::string& bdsId) { bdsId_ = bdsId; - setCoreParameter("BdsId", bdsId); + setParameter("BdsId", bdsId); } std::string CreateHbaseHaSlbRequest::getHaId()const @@ -68,6 +68,6 @@ std::string CreateHbaseHaSlbRequest::getHaId()const void CreateHbaseHaSlbRequest::setHaId(const std::string& haId) { haId_ = haId; - setCoreParameter("HaId", haId); + setParameter("HaId", haId); } diff --git a/hbase/src/model/CreateInstanceRequest.cc b/hbase/src/model/CreateInstanceRequest.cc index d29a9adcf..2b98f0cdf 100644 --- a/hbase/src/model/CreateInstanceRequest.cc +++ b/hbase/src/model/CreateInstanceRequest.cc @@ -35,7 +35,7 @@ std::string CreateInstanceRequest::getClusterName()const void CreateInstanceRequest::setClusterName(const std::string& clusterName) { clusterName_ = clusterName; - setCoreParameter("ClusterName", clusterName); + setParameter("ClusterName", clusterName); } std::string CreateInstanceRequest::getDbInstanceConnType()const @@ -46,7 +46,7 @@ std::string CreateInstanceRequest::getDbInstanceConnType()const void CreateInstanceRequest::setDbInstanceConnType(const std::string& dbInstanceConnType) { dbInstanceConnType_ = dbInstanceConnType; - setCoreParameter("DbInstanceConnType", dbInstanceConnType); + setParameter("DbInstanceConnType", dbInstanceConnType); } std::string CreateInstanceRequest::getEngineVersion()const @@ -57,7 +57,7 @@ std::string CreateInstanceRequest::getEngineVersion()const void CreateInstanceRequest::setEngineVersion(const std::string& engineVersion) { engineVersion_ = engineVersion; - setCoreParameter("EngineVersion", engineVersion); + setParameter("EngineVersion", engineVersion); } std::string CreateInstanceRequest::getDepMode()const @@ -68,7 +68,7 @@ std::string CreateInstanceRequest::getDepMode()const void CreateInstanceRequest::setDepMode(const std::string& depMode) { depMode_ = depMode; - setCoreParameter("DepMode", depMode); + setParameter("DepMode", depMode); } std::string CreateInstanceRequest::getBackupId()const @@ -79,7 +79,7 @@ std::string CreateInstanceRequest::getBackupId()const void CreateInstanceRequest::setBackupId(const std::string& backupId) { backupId_ = backupId; - setCoreParameter("BackupId", backupId); + setParameter("BackupId", backupId); } std::string CreateInstanceRequest::getDbInstanceType()const @@ -90,7 +90,7 @@ std::string CreateInstanceRequest::getDbInstanceType()const void CreateInstanceRequest::setDbInstanceType(const std::string& dbInstanceType) { dbInstanceType_ = dbInstanceType; - setCoreParameter("DbInstanceType", dbInstanceType); + setParameter("DbInstanceType", dbInstanceType); } std::string CreateInstanceRequest::getVSwitchId()const @@ -101,7 +101,7 @@ std::string CreateInstanceRequest::getVSwitchId()const void CreateInstanceRequest::setVSwitchId(const std::string& vSwitchId) { vSwitchId_ = vSwitchId; - setCoreParameter("VSwitchId", vSwitchId); + setParameter("VSwitchId", vSwitchId); } std::string CreateInstanceRequest::getSecurityIPList()const @@ -112,7 +112,7 @@ std::string CreateInstanceRequest::getSecurityIPList()const void CreateInstanceRequest::setSecurityIPList(const std::string& securityIPList) { securityIPList_ = securityIPList; - setCoreParameter("SecurityIPList", securityIPList); + setParameter("SecurityIPList", securityIPList); } std::string CreateInstanceRequest::getAutoRenew()const @@ -123,7 +123,7 @@ std::string CreateInstanceRequest::getAutoRenew()const void CreateInstanceRequest::setAutoRenew(const std::string& autoRenew) { autoRenew_ = autoRenew; - setCoreParameter("AutoRenew", autoRenew); + setParameter("AutoRenew", autoRenew); } std::string CreateInstanceRequest::getNetType()const @@ -134,7 +134,7 @@ std::string CreateInstanceRequest::getNetType()const void CreateInstanceRequest::setNetType(const std::string& netType) { netType_ = netType; - setCoreParameter("NetType", netType); + setParameter("NetType", netType); } std::string CreateInstanceRequest::getZoneId()const @@ -145,7 +145,7 @@ std::string CreateInstanceRequest::getZoneId()const void CreateInstanceRequest::setZoneId(const std::string& zoneId) { zoneId_ = zoneId; - setCoreParameter("ZoneId", zoneId); + setParameter("ZoneId", zoneId); } std::string CreateInstanceRequest::getCoreDiskType()const @@ -156,7 +156,7 @@ std::string CreateInstanceRequest::getCoreDiskType()const void CreateInstanceRequest::setCoreDiskType(const std::string& coreDiskType) { coreDiskType_ = coreDiskType; - setCoreParameter("CoreDiskType", coreDiskType); + setParameter("CoreDiskType", coreDiskType); } std::string CreateInstanceRequest::getPricingCycle()const @@ -167,7 +167,7 @@ std::string CreateInstanceRequest::getPricingCycle()const void CreateInstanceRequest::setPricingCycle(const std::string& pricingCycle) { pricingCycle_ = pricingCycle; - setCoreParameter("PricingCycle", pricingCycle); + setParameter("PricingCycle", pricingCycle); } std::string CreateInstanceRequest::getCoreInstanceQuantity()const @@ -178,7 +178,7 @@ std::string CreateInstanceRequest::getCoreInstanceQuantity()const void CreateInstanceRequest::setCoreInstanceQuantity(const std::string& coreInstanceQuantity) { coreInstanceQuantity_ = coreInstanceQuantity; - setCoreParameter("CoreInstanceQuantity", coreInstanceQuantity); + setParameter("CoreInstanceQuantity", coreInstanceQuantity); } std::string CreateInstanceRequest::getDuration()const @@ -189,7 +189,7 @@ std::string CreateInstanceRequest::getDuration()const void CreateInstanceRequest::setDuration(const std::string& duration) { duration_ = duration; - setCoreParameter("Duration", duration); + setParameter("Duration", duration); } std::string CreateInstanceRequest::getRegionId()const @@ -200,7 +200,7 @@ std::string CreateInstanceRequest::getRegionId()const void CreateInstanceRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } std::string CreateInstanceRequest::getEngine()const @@ -211,7 +211,7 @@ std::string CreateInstanceRequest::getEngine()const void CreateInstanceRequest::setEngine(const std::string& engine) { engine_ = engine; - setCoreParameter("Engine", engine); + setParameter("Engine", engine); } std::string CreateInstanceRequest::getRestoreTime()const @@ -222,7 +222,7 @@ std::string CreateInstanceRequest::getRestoreTime()const void CreateInstanceRequest::setRestoreTime(const std::string& restoreTime) { restoreTime_ = restoreTime; - setCoreParameter("RestoreTime", restoreTime); + setParameter("RestoreTime", restoreTime); } std::string CreateInstanceRequest::getSrcDBInstanceId()const @@ -233,7 +233,7 @@ std::string CreateInstanceRequest::getSrcDBInstanceId()const void CreateInstanceRequest::setSrcDBInstanceId(const std::string& srcDBInstanceId) { srcDBInstanceId_ = srcDBInstanceId; - setCoreParameter("SrcDBInstanceId", srcDBInstanceId); + setParameter("SrcDBInstanceId", srcDBInstanceId); } std::string CreateInstanceRequest::getMasterInstanceType()const @@ -244,7 +244,7 @@ std::string CreateInstanceRequest::getMasterInstanceType()const void CreateInstanceRequest::setMasterInstanceType(const std::string& masterInstanceType) { masterInstanceType_ = masterInstanceType; - setCoreParameter("MasterInstanceType", masterInstanceType); + setParameter("MasterInstanceType", masterInstanceType); } std::string CreateInstanceRequest::getColdStorageSize()const @@ -255,7 +255,7 @@ std::string CreateInstanceRequest::getColdStorageSize()const void CreateInstanceRequest::setColdStorageSize(const std::string& coldStorageSize) { coldStorageSize_ = coldStorageSize; - setCoreParameter("ColdStorageSize", coldStorageSize); + setParameter("ColdStorageSize", coldStorageSize); } std::string CreateInstanceRequest::getCoreDiskQuantity()const @@ -266,7 +266,7 @@ std::string CreateInstanceRequest::getCoreDiskQuantity()const void CreateInstanceRequest::setCoreDiskQuantity(const std::string& coreDiskQuantity) { coreDiskQuantity_ = coreDiskQuantity; - setCoreParameter("CoreDiskQuantity", coreDiskQuantity); + setParameter("CoreDiskQuantity", coreDiskQuantity); } std::string CreateInstanceRequest::getIsColdStorage()const @@ -277,7 +277,7 @@ std::string CreateInstanceRequest::getIsColdStorage()const void CreateInstanceRequest::setIsColdStorage(const std::string& isColdStorage) { isColdStorage_ = isColdStorage; - setCoreParameter("IsColdStorage", isColdStorage); + setParameter("IsColdStorage", isColdStorage); } std::string CreateInstanceRequest::getCoreInstanceType()const @@ -288,7 +288,7 @@ std::string CreateInstanceRequest::getCoreInstanceType()const void CreateInstanceRequest::setCoreInstanceType(const std::string& coreInstanceType) { coreInstanceType_ = coreInstanceType; - setCoreParameter("CoreInstanceType", coreInstanceType); + setParameter("CoreInstanceType", coreInstanceType); } std::string CreateInstanceRequest::getCoreDiskSize()const @@ -299,7 +299,7 @@ std::string CreateInstanceRequest::getCoreDiskSize()const void CreateInstanceRequest::setCoreDiskSize(const std::string& coreDiskSize) { coreDiskSize_ = coreDiskSize; - setCoreParameter("CoreDiskSize", coreDiskSize); + setParameter("CoreDiskSize", coreDiskSize); } std::string CreateInstanceRequest::getVpcId()const @@ -310,7 +310,7 @@ std::string CreateInstanceRequest::getVpcId()const void CreateInstanceRequest::setVpcId(const std::string& vpcId) { vpcId_ = vpcId; - setCoreParameter("VpcId", vpcId); + setParameter("VpcId", vpcId); } std::string CreateInstanceRequest::getDbType()const @@ -321,7 +321,7 @@ std::string CreateInstanceRequest::getDbType()const void CreateInstanceRequest::setDbType(const std::string& dbType) { dbType_ = dbType; - setCoreParameter("DbType", dbType); + setParameter("DbType", dbType); } std::string CreateInstanceRequest::getPayType()const @@ -332,6 +332,6 @@ std::string CreateInstanceRequest::getPayType()const void CreateInstanceRequest::setPayType(const std::string& payType) { payType_ = payType; - setCoreParameter("PayType", payType); + setParameter("PayType", payType); } diff --git a/hbase/src/model/DeleteHbaseHaSlbRequest.cc b/hbase/src/model/DeleteHbaseHaSlbRequest.cc index 6c44b2d6f..2f2488210 100644 --- a/hbase/src/model/DeleteHbaseHaSlbRequest.cc +++ b/hbase/src/model/DeleteHbaseHaSlbRequest.cc @@ -35,7 +35,7 @@ std::string DeleteHbaseHaSlbRequest::getHaId()const void DeleteHbaseHaSlbRequest::setHaId(const std::string& haId) { haId_ = haId; - setCoreParameter("HaId", haId); + setParameter("HaId", haId); } std::string DeleteHbaseHaSlbRequest::getHaTypes()const @@ -46,7 +46,7 @@ std::string DeleteHbaseHaSlbRequest::getHaTypes()const void DeleteHbaseHaSlbRequest::setHaTypes(const std::string& haTypes) { haTypes_ = haTypes; - setCoreParameter("HaTypes", haTypes); + setParameter("HaTypes", haTypes); } std::string DeleteHbaseHaSlbRequest::getBdsId()const @@ -57,6 +57,6 @@ std::string DeleteHbaseHaSlbRequest::getBdsId()const void DeleteHbaseHaSlbRequest::setBdsId(const std::string& bdsId) { bdsId_ = bdsId; - setCoreParameter("BdsId", bdsId); + setParameter("BdsId", bdsId); } diff --git a/hbase/src/model/DeleteInstanceRequest.cc b/hbase/src/model/DeleteInstanceRequest.cc index 18d17ae55..0a472ded0 100644 --- a/hbase/src/model/DeleteInstanceRequest.cc +++ b/hbase/src/model/DeleteInstanceRequest.cc @@ -35,7 +35,7 @@ bool DeleteInstanceRequest::getImmediateDeleteFlag()const void DeleteInstanceRequest::setImmediateDeleteFlag(bool immediateDeleteFlag) { immediateDeleteFlag_ = immediateDeleteFlag; - setCoreParameter("ImmediateDeleteFlag", immediateDeleteFlag ? "true" : "false"); + setParameter("ImmediateDeleteFlag", immediateDeleteFlag ? "true" : "false"); } std::string DeleteInstanceRequest::getClusterId()const @@ -46,6 +46,6 @@ std::string DeleteInstanceRequest::getClusterId()const void DeleteInstanceRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/DeleteUserHdfsInfoRequest.cc b/hbase/src/model/DeleteUserHdfsInfoRequest.cc index 0c52c951a..ab9023d3c 100644 --- a/hbase/src/model/DeleteUserHdfsInfoRequest.cc +++ b/hbase/src/model/DeleteUserHdfsInfoRequest.cc @@ -35,7 +35,7 @@ std::string DeleteUserHdfsInfoRequest::getClusterId()const void DeleteUserHdfsInfoRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string DeleteUserHdfsInfoRequest::getNameService()const @@ -46,6 +46,6 @@ std::string DeleteUserHdfsInfoRequest::getNameService()const void DeleteUserHdfsInfoRequest::setNameService(const std::string& nameService) { nameService_ = nameService; - setCoreParameter("NameService", nameService); + setParameter("NameService", nameService); } diff --git a/hbase/src/model/DescribeDBInstanceUsageRequest.cc b/hbase/src/model/DescribeDBInstanceUsageRequest.cc index f23a8c7aa..7dbbb9921 100644 --- a/hbase/src/model/DescribeDBInstanceUsageRequest.cc +++ b/hbase/src/model/DescribeDBInstanceUsageRequest.cc @@ -35,6 +35,6 @@ std::string DescribeDBInstanceUsageRequest::getClusterId()const void DescribeDBInstanceUsageRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/DescribeEndpointsRequest.cc b/hbase/src/model/DescribeEndpointsRequest.cc index 824308af6..8f7350381 100644 --- a/hbase/src/model/DescribeEndpointsRequest.cc +++ b/hbase/src/model/DescribeEndpointsRequest.cc @@ -35,6 +35,6 @@ std::string DescribeEndpointsRequest::getClusterId()const void DescribeEndpointsRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/DescribeInstanceRequest.cc b/hbase/src/model/DescribeInstanceRequest.cc index e346e81f4..4e520495e 100644 --- a/hbase/src/model/DescribeInstanceRequest.cc +++ b/hbase/src/model/DescribeInstanceRequest.cc @@ -35,6 +35,6 @@ std::string DescribeInstanceRequest::getClusterId()const void DescribeInstanceRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/DescribeInstanceResult.cc b/hbase/src/model/DescribeInstanceResult.cc index b8d480c14..710a41771 100644 --- a/hbase/src/model/DescribeInstanceResult.cc +++ b/hbase/src/model/DescribeInstanceResult.cc @@ -109,6 +109,18 @@ void DescribeInstanceResult::parse(const std::string &payload) createdTimeUTC_ = value["CreatedTimeUTC"].asString(); if(!value["ExpireTimeUTC"].isNull()) expireTimeUTC_ = value["ExpireTimeUTC"].asString(); + if(!value["IsLatestVersion"].isNull()) + isLatestVersion_ = value["IsLatestVersion"].asString() == "true"; + if(!value["IsMultiModel"].isNull()) + isMultiModel_ = value["IsMultiModel"].asString() == "true"; + if(!value["ClusterType"].isNull()) + clusterType_ = value["ClusterType"].asString(); + if(!value["ClusterId"].isNull()) + clusterId_ = value["ClusterId"].asString(); + if(!value["ClusterName"].isNull()) + clusterName_ = value["ClusterName"].asString(); + if(!value["IsDeletionProtection"].isNull()) + isDeletionProtection_ = value["IsDeletionProtection"].asString() == "true"; } @@ -127,6 +139,16 @@ std::string DescribeInstanceResult::getMasterInstanceType()const return masterInstanceType_; } +bool DescribeInstanceResult::getIsDeletionProtection()const +{ + return isDeletionProtection_; +} + +bool DescribeInstanceResult::getIsLatestVersion()const +{ + return isLatestVersion_; +} + std::string DescribeInstanceResult::getMaintainEndTime()const { return maintainEndTime_; @@ -142,6 +164,11 @@ std::string DescribeInstanceResult::getCoreInstanceType()const return coreInstanceType_; } +std::string DescribeInstanceResult::getClusterName()const +{ + return clusterName_; +} + std::string DescribeInstanceResult::getMasterDiskType()const { return masterDiskType_; @@ -202,6 +229,11 @@ int DescribeInstanceResult::getCoreNodeCount()const return coreNodeCount_; } +std::string DescribeInstanceResult::getClusterId()const +{ + return clusterId_; +} + std::string DescribeInstanceResult::getColdStorageStatus()const { return coldStorageStatus_; @@ -222,6 +254,16 @@ std::string DescribeInstanceResult::getPayType()const return payType_; } +bool DescribeInstanceResult::getIsMultiModel()const +{ + return isMultiModel_; +} + +std::string DescribeInstanceResult::getClusterType()const +{ + return clusterType_; +} + std::string DescribeInstanceResult::getVswitchId()const { return vswitchId_; diff --git a/hbase/src/model/DescribeInstanceTypeRequest.cc b/hbase/src/model/DescribeInstanceTypeRequest.cc index a1f194c61..db9253169 100644 --- a/hbase/src/model/DescribeInstanceTypeRequest.cc +++ b/hbase/src/model/DescribeInstanceTypeRequest.cc @@ -35,6 +35,6 @@ std::string DescribeInstanceTypeRequest::getInstanceType()const void DescribeInstanceTypeRequest::setInstanceType(const std::string& instanceType) { instanceType_ = instanceType; - setCoreParameter("InstanceType", instanceType); + setParameter("InstanceType", instanceType); } diff --git a/hbase/src/model/DescribeInstancesRequest.cc b/hbase/src/model/DescribeInstancesRequest.cc index d8557f15b..98d89e9d8 100644 --- a/hbase/src/model/DescribeInstancesRequest.cc +++ b/hbase/src/model/DescribeInstancesRequest.cc @@ -35,7 +35,7 @@ std::string DescribeInstancesRequest::getClusterName()const void DescribeInstancesRequest::setClusterName(const std::string& clusterName) { clusterName_ = clusterName; - setCoreParameter("ClusterName", clusterName); + setParameter("ClusterName", clusterName); } int DescribeInstancesRequest::getPageNumber()const @@ -46,7 +46,7 @@ int DescribeInstancesRequest::getPageNumber()const void DescribeInstancesRequest::setPageNumber(int pageNumber) { pageNumber_ = pageNumber; - setCoreParameter("PageNumber", std::to_string(pageNumber)); + setParameter("PageNumber", std::to_string(pageNumber)); } std::string DescribeInstancesRequest::getRegionId()const @@ -57,7 +57,7 @@ std::string DescribeInstancesRequest::getRegionId()const void DescribeInstancesRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } int DescribeInstancesRequest::getPageSize()const @@ -68,7 +68,7 @@ int DescribeInstancesRequest::getPageSize()const void DescribeInstancesRequest::setPageSize(int pageSize) { pageSize_ = pageSize; - setCoreParameter("PageSize", std::to_string(pageSize)); + setParameter("PageSize", std::to_string(pageSize)); } std::vector DescribeInstancesRequest::getTag()const @@ -81,9 +81,9 @@ void DescribeInstancesRequest::setTag(const std::vector& tag) tag_ = tag; for(int dep1 = 0; dep1!= tag.size(); dep1++) { auto tagObj = tag.at(dep1); - std::string tagObjStr = "Tag." + std::to_string(dep1); - setCoreParameter(tagObjStr + ".Value", tagObj.value); - setCoreParameter(tagObjStr + ".Key", tagObj.key); + std::string tagObjStr = "Tag." + std::to_string(dep1 + 1); + setParameter(tagObjStr + ".Value", tagObj.value); + setParameter(tagObjStr + ".Key", tagObj.key); } } @@ -95,6 +95,6 @@ std::string DescribeInstancesRequest::getDbType()const void DescribeInstancesRequest::setDbType(const std::string& dbType) { dbType_ = dbType; - setCoreParameter("DbType", dbType); + setParameter("DbType", dbType); } diff --git a/hbase/src/model/DescribeInstancesResult.cc b/hbase/src/model/DescribeInstancesResult.cc index a74a863da..56a41e1bf 100644 --- a/hbase/src/model/DescribeInstancesResult.cc +++ b/hbase/src/model/DescribeInstancesResult.cc @@ -97,6 +97,12 @@ void DescribeInstancesResult::parse(const std::string &payload) instancesObject.createdTimeUTC = valueInstancesInstance["CreatedTimeUTC"].asString(); if(!valueInstancesInstance["ExpireTimeUTC"].isNull()) instancesObject.expireTimeUTC = valueInstancesInstance["ExpireTimeUTC"].asString(); + if(!valueInstancesInstance["ClusterId"].isNull()) + instancesObject.clusterId = valueInstancesInstance["ClusterId"].asString(); + if(!valueInstancesInstance["ClusterName"].isNull()) + instancesObject.clusterName = valueInstancesInstance["ClusterName"].asString(); + if(!valueInstancesInstance["IsDeletionProtection"].isNull()) + instancesObject.isDeletionProtection = valueInstancesInstance["IsDeletionProtection"].asString() == "true"; auto allTagsNode = allInstancesNode["Tags"]["Tag"]; for (auto allInstancesNodeTagsTag : allTagsNode) { diff --git a/hbase/src/model/DescribeIpWhitelistRequest.cc b/hbase/src/model/DescribeIpWhitelistRequest.cc index d7be16596..e345a68c6 100644 --- a/hbase/src/model/DescribeIpWhitelistRequest.cc +++ b/hbase/src/model/DescribeIpWhitelistRequest.cc @@ -35,6 +35,6 @@ std::string DescribeIpWhitelistRequest::getClusterId()const void DescribeIpWhitelistRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/DescribeRegionsRequest.cc b/hbase/src/model/DescribeRegionsRequest.cc index 88a49e107..a83aa4c93 100644 --- a/hbase/src/model/DescribeRegionsRequest.cc +++ b/hbase/src/model/DescribeRegionsRequest.cc @@ -35,6 +35,6 @@ std::string DescribeRegionsRequest::getAcceptLanguage()const void DescribeRegionsRequest::setAcceptLanguage(const std::string& acceptLanguage) { acceptLanguage_ = acceptLanguage; - setCoreParameter("AcceptLanguage", acceptLanguage); + setParameter("AcceptLanguage", acceptLanguage); } diff --git a/hbase/src/model/DescribeSecurityGroupsRequest.cc b/hbase/src/model/DescribeSecurityGroupsRequest.cc index 4bafa1ccc..b6dabc3c8 100644 --- a/hbase/src/model/DescribeSecurityGroupsRequest.cc +++ b/hbase/src/model/DescribeSecurityGroupsRequest.cc @@ -35,6 +35,6 @@ std::string DescribeSecurityGroupsRequest::getClusterId()const void DescribeSecurityGroupsRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/ListTagResourcesRequest.cc b/hbase/src/model/ListTagResourcesRequest.cc index dd4c0f9b7..0e724fae3 100644 --- a/hbase/src/model/ListTagResourcesRequest.cc +++ b/hbase/src/model/ListTagResourcesRequest.cc @@ -35,7 +35,7 @@ std::string ListTagResourcesRequest::getRegionId()const void ListTagResourcesRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } std::string ListTagResourcesRequest::getNextToken()const @@ -46,7 +46,7 @@ std::string ListTagResourcesRequest::getNextToken()const void ListTagResourcesRequest::setNextToken(const std::string& nextToken) { nextToken_ = nextToken; - setCoreParameter("NextToken", nextToken); + setParameter("NextToken", nextToken); } std::vector ListTagResourcesRequest::getTag()const @@ -59,9 +59,9 @@ void ListTagResourcesRequest::setTag(const std::vector& tag) tag_ = tag; for(int dep1 = 0; dep1!= tag.size(); dep1++) { auto tagObj = tag.at(dep1); - std::string tagObjStr = "Tag." + std::to_string(dep1); - setCoreParameter(tagObjStr + ".Value", tagObj.value); - setCoreParameter(tagObjStr + ".Key", tagObj.key); + std::string tagObjStr = "Tag." + std::to_string(dep1 + 1); + setParameter(tagObjStr + ".Value", tagObj.value); + setParameter(tagObjStr + ".Key", tagObj.key); } } @@ -74,7 +74,7 @@ void ListTagResourcesRequest::setResourceId(const std::vector& reso { resourceId_ = resourceId; for(int dep1 = 0; dep1!= resourceId.size(); dep1++) { - setCoreParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); + setParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); } } diff --git a/hbase/src/model/ListTagsRequest.cc b/hbase/src/model/ListTagsRequest.cc index bef107ddc..d2e5cab7d 100644 --- a/hbase/src/model/ListTagsRequest.cc +++ b/hbase/src/model/ListTagsRequest.cc @@ -35,6 +35,6 @@ std::string ListTagsRequest::getRegionId()const void ListTagsRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } diff --git a/hbase/src/model/ModifyClusterDeletionProtectionRequest.cc b/hbase/src/model/ModifyClusterDeletionProtectionRequest.cc new file mode 100644 index 000000000..a366f2e17 --- /dev/null +++ b/hbase/src/model/ModifyClusterDeletionProtectionRequest.cc @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::HBase::Model::ModifyClusterDeletionProtectionRequest; + +ModifyClusterDeletionProtectionRequest::ModifyClusterDeletionProtectionRequest() : + RpcServiceRequest("hbase", "2019-01-01", "ModifyClusterDeletionProtection") +{ + setMethod(HttpRequest::Method::Post); +} + +ModifyClusterDeletionProtectionRequest::~ModifyClusterDeletionProtectionRequest() +{} + +bool ModifyClusterDeletionProtectionRequest::getProtection()const +{ + return protection_; +} + +void ModifyClusterDeletionProtectionRequest::setProtection(bool protection) +{ + protection_ = protection; + setParameter("Protection", protection ? "true" : "false"); +} + +std::string ModifyClusterDeletionProtectionRequest::getClusterId()const +{ + return clusterId_; +} + +void ModifyClusterDeletionProtectionRequest::setClusterId(const std::string& clusterId) +{ + clusterId_ = clusterId; + setParameter("ClusterId", clusterId); +} + diff --git a/hbase/src/model/ModifyClusterDeletionProtectionResult.cc b/hbase/src/model/ModifyClusterDeletionProtectionResult.cc new file mode 100644 index 000000000..d0568f188 --- /dev/null +++ b/hbase/src/model/ModifyClusterDeletionProtectionResult.cc @@ -0,0 +1,44 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::HBase; +using namespace AlibabaCloud::HBase::Model; + +ModifyClusterDeletionProtectionResult::ModifyClusterDeletionProtectionResult() : + ServiceResult() +{} + +ModifyClusterDeletionProtectionResult::ModifyClusterDeletionProtectionResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +ModifyClusterDeletionProtectionResult::~ModifyClusterDeletionProtectionResult() +{} + +void ModifyClusterDeletionProtectionResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + +} + diff --git a/hbase/src/model/ModifyInstanceMaintainTimeRequest.cc b/hbase/src/model/ModifyInstanceMaintainTimeRequest.cc index 16e444224..989893e1a 100644 --- a/hbase/src/model/ModifyInstanceMaintainTimeRequest.cc +++ b/hbase/src/model/ModifyInstanceMaintainTimeRequest.cc @@ -35,7 +35,7 @@ std::string ModifyInstanceMaintainTimeRequest::getClusterId()const void ModifyInstanceMaintainTimeRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string ModifyInstanceMaintainTimeRequest::getMaintainEndTime()const @@ -46,7 +46,7 @@ std::string ModifyInstanceMaintainTimeRequest::getMaintainEndTime()const void ModifyInstanceMaintainTimeRequest::setMaintainEndTime(const std::string& maintainEndTime) { maintainEndTime_ = maintainEndTime; - setCoreParameter("MaintainEndTime", maintainEndTime); + setParameter("MaintainEndTime", maintainEndTime); } std::string ModifyInstanceMaintainTimeRequest::getMaintainStartTime()const @@ -57,6 +57,6 @@ std::string ModifyInstanceMaintainTimeRequest::getMaintainStartTime()const void ModifyInstanceMaintainTimeRequest::setMaintainStartTime(const std::string& maintainStartTime) { maintainStartTime_ = maintainStartTime; - setCoreParameter("MaintainStartTime", maintainStartTime); + setParameter("MaintainStartTime", maintainStartTime); } diff --git a/hbase/src/model/ModifyInstanceNameRequest.cc b/hbase/src/model/ModifyInstanceNameRequest.cc index 81f59a609..fe6ae63d5 100644 --- a/hbase/src/model/ModifyInstanceNameRequest.cc +++ b/hbase/src/model/ModifyInstanceNameRequest.cc @@ -35,7 +35,7 @@ std::string ModifyInstanceNameRequest::getClientToken()const void ModifyInstanceNameRequest::setClientToken(const std::string& clientToken) { clientToken_ = clientToken; - setCoreParameter("ClientToken", clientToken); + setParameter("ClientToken", clientToken); } std::string ModifyInstanceNameRequest::getClusterName()const @@ -46,7 +46,7 @@ std::string ModifyInstanceNameRequest::getClusterName()const void ModifyInstanceNameRequest::setClusterName(const std::string& clusterName) { clusterName_ = clusterName; - setCoreParameter("ClusterName", clusterName); + setParameter("ClusterName", clusterName); } std::string ModifyInstanceNameRequest::getClusterId()const @@ -57,7 +57,7 @@ std::string ModifyInstanceNameRequest::getClusterId()const void ModifyInstanceNameRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string ModifyInstanceNameRequest::getAccessKeyId()const @@ -68,7 +68,7 @@ std::string ModifyInstanceNameRequest::getAccessKeyId()const void ModifyInstanceNameRequest::setAccessKeyId(const std::string& accessKeyId) { accessKeyId_ = accessKeyId; - setCoreParameter("AccessKeyId", accessKeyId); + setParameter("AccessKeyId", accessKeyId); } std::string ModifyInstanceNameRequest::getRegionId()const @@ -79,7 +79,7 @@ std::string ModifyInstanceNameRequest::getRegionId()const void ModifyInstanceNameRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } std::string ModifyInstanceNameRequest::getZoneId()const @@ -90,6 +90,6 @@ std::string ModifyInstanceNameRequest::getZoneId()const void ModifyInstanceNameRequest::setZoneId(const std::string& zoneId) { zoneId_ = zoneId; - setCoreParameter("ZoneId", zoneId); + setParameter("ZoneId", zoneId); } diff --git a/hbase/src/model/ModifyIpWhitelistRequest.cc b/hbase/src/model/ModifyIpWhitelistRequest.cc index 8733e3ba2..4318e44d5 100644 --- a/hbase/src/model/ModifyIpWhitelistRequest.cc +++ b/hbase/src/model/ModifyIpWhitelistRequest.cc @@ -35,7 +35,7 @@ std::string ModifyIpWhitelistRequest::getIpList()const void ModifyIpWhitelistRequest::setIpList(const std::string& ipList) { ipList_ = ipList; - setCoreParameter("IpList", ipList); + setParameter("IpList", ipList); } std::string ModifyIpWhitelistRequest::getIpVersion()const @@ -46,7 +46,7 @@ std::string ModifyIpWhitelistRequest::getIpVersion()const void ModifyIpWhitelistRequest::setIpVersion(const std::string& ipVersion) { ipVersion_ = ipVersion; - setCoreParameter("IpVersion", ipVersion); + setParameter("IpVersion", ipVersion); } std::string ModifyIpWhitelistRequest::getClusterId()const @@ -57,7 +57,7 @@ std::string ModifyIpWhitelistRequest::getClusterId()const void ModifyIpWhitelistRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string ModifyIpWhitelistRequest::getGroupName()const @@ -68,6 +68,6 @@ std::string ModifyIpWhitelistRequest::getGroupName()const void ModifyIpWhitelistRequest::setGroupName(const std::string& groupName) { groupName_ = groupName; - setCoreParameter("GroupName", groupName); + setParameter("GroupName", groupName); } diff --git a/hbase/src/model/ModifySecurityGroupsRequest.cc b/hbase/src/model/ModifySecurityGroupsRequest.cc index db3a522b4..57d224e57 100644 --- a/hbase/src/model/ModifySecurityGroupsRequest.cc +++ b/hbase/src/model/ModifySecurityGroupsRequest.cc @@ -35,7 +35,7 @@ std::string ModifySecurityGroupsRequest::getClusterId()const void ModifySecurityGroupsRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string ModifySecurityGroupsRequest::getSecurityGroupIds()const @@ -46,6 +46,6 @@ std::string ModifySecurityGroupsRequest::getSecurityGroupIds()const void ModifySecurityGroupsRequest::setSecurityGroupIds(const std::string& securityGroupIds) { securityGroupIds_ = securityGroupIds; - setCoreParameter("SecurityGroupIds", securityGroupIds); + setParameter("SecurityGroupIds", securityGroupIds); } diff --git a/hbase/src/model/ModifyUIAccountPasswordRequest.cc b/hbase/src/model/ModifyUIAccountPasswordRequest.cc index ee89d1990..944b369a8 100644 --- a/hbase/src/model/ModifyUIAccountPasswordRequest.cc +++ b/hbase/src/model/ModifyUIAccountPasswordRequest.cc @@ -35,7 +35,7 @@ std::string ModifyUIAccountPasswordRequest::getClusterId()const void ModifyUIAccountPasswordRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string ModifyUIAccountPasswordRequest::getAccountPassword()const @@ -46,7 +46,7 @@ std::string ModifyUIAccountPasswordRequest::getAccountPassword()const void ModifyUIAccountPasswordRequest::setAccountPassword(const std::string& accountPassword) { accountPassword_ = accountPassword; - setCoreParameter("AccountPassword", accountPassword); + setParameter("AccountPassword", accountPassword); } std::string ModifyUIAccountPasswordRequest::getAccountName()const @@ -57,6 +57,6 @@ std::string ModifyUIAccountPasswordRequest::getAccountName()const void ModifyUIAccountPasswordRequest::setAccountName(const std::string& accountName) { accountName_ = accountName; - setCoreParameter("AccountName", accountName); + setParameter("AccountName", accountName); } diff --git a/hbase/src/model/QueryHBaseHaDBRequest.cc b/hbase/src/model/QueryHBaseHaDBRequest.cc index 2410d6632..b3616ec24 100644 --- a/hbase/src/model/QueryHBaseHaDBRequest.cc +++ b/hbase/src/model/QueryHBaseHaDBRequest.cc @@ -35,6 +35,6 @@ std::string QueryHBaseHaDBRequest::getBdsId()const void QueryHBaseHaDBRequest::setBdsId(const std::string& bdsId) { bdsId_ = bdsId; - setCoreParameter("BdsId", bdsId); + setParameter("BdsId", bdsId); } diff --git a/hbase/src/model/QueryXpackRelateDBRequest.cc b/hbase/src/model/QueryXpackRelateDBRequest.cc index 742df91fc..2c7e6aff4 100644 --- a/hbase/src/model/QueryXpackRelateDBRequest.cc +++ b/hbase/src/model/QueryXpackRelateDBRequest.cc @@ -27,6 +27,17 @@ QueryXpackRelateDBRequest::QueryXpackRelateDBRequest() : QueryXpackRelateDBRequest::~QueryXpackRelateDBRequest() {} +bool QueryXpackRelateDBRequest::getHasSingleNode()const +{ + return hasSingleNode_; +} + +void QueryXpackRelateDBRequest::setHasSingleNode(bool hasSingleNode) +{ + hasSingleNode_ = hasSingleNode; + setParameter("HasSingleNode", hasSingleNode ? "true" : "false"); +} + std::string QueryXpackRelateDBRequest::getClusterId()const { return clusterId_; @@ -35,7 +46,7 @@ std::string QueryXpackRelateDBRequest::getClusterId()const void QueryXpackRelateDBRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string QueryXpackRelateDBRequest::getRelateDbType()const @@ -46,6 +57,6 @@ std::string QueryXpackRelateDBRequest::getRelateDbType()const void QueryXpackRelateDBRequest::setRelateDbType(const std::string& relateDbType) { relateDbType_ = relateDbType; - setCoreParameter("RelateDbType", relateDbType); + setParameter("RelateDbType", relateDbType); } diff --git a/hbase/src/model/RenewInstanceRequest.cc b/hbase/src/model/RenewInstanceRequest.cc index e4ba8a009..9ad99f6a0 100644 --- a/hbase/src/model/RenewInstanceRequest.cc +++ b/hbase/src/model/RenewInstanceRequest.cc @@ -35,7 +35,7 @@ std::string RenewInstanceRequest::getClusterId()const void RenewInstanceRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } int RenewInstanceRequest::getDuration()const @@ -46,7 +46,7 @@ int RenewInstanceRequest::getDuration()const void RenewInstanceRequest::setDuration(int duration) { duration_ = duration; - setCoreParameter("Duration", std::to_string(duration)); + setParameter("Duration", std::to_string(duration)); } std::string RenewInstanceRequest::getPricingCycle()const @@ -57,6 +57,6 @@ std::string RenewInstanceRequest::getPricingCycle()const void RenewInstanceRequest::setPricingCycle(const std::string& pricingCycle) { pricingCycle_ = pricingCycle; - setCoreParameter("PricingCycle", pricingCycle); + setParameter("PricingCycle", pricingCycle); } diff --git a/hbase/src/model/ResizeDiskSizeRequest.cc b/hbase/src/model/ResizeDiskSizeRequest.cc index f2b2adce2..04ca5c1de 100644 --- a/hbase/src/model/ResizeDiskSizeRequest.cc +++ b/hbase/src/model/ResizeDiskSizeRequest.cc @@ -35,7 +35,7 @@ int ResizeDiskSizeRequest::getNodeDiskSize()const void ResizeDiskSizeRequest::setNodeDiskSize(int nodeDiskSize) { nodeDiskSize_ = nodeDiskSize; - setCoreParameter("NodeDiskSize", std::to_string(nodeDiskSize)); + setParameter("NodeDiskSize", std::to_string(nodeDiskSize)); } std::string ResizeDiskSizeRequest::getClusterId()const @@ -46,6 +46,6 @@ std::string ResizeDiskSizeRequest::getClusterId()const void ResizeDiskSizeRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/ResizeNodeCountRequest.cc b/hbase/src/model/ResizeNodeCountRequest.cc index d1ccc1d33..1c8c38ad3 100644 --- a/hbase/src/model/ResizeNodeCountRequest.cc +++ b/hbase/src/model/ResizeNodeCountRequest.cc @@ -35,7 +35,7 @@ std::string ResizeNodeCountRequest::getClusterId()const void ResizeNodeCountRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } int ResizeNodeCountRequest::getNodeCount()const @@ -46,6 +46,6 @@ int ResizeNodeCountRequest::getNodeCount()const void ResizeNodeCountRequest::setNodeCount(int nodeCount) { nodeCount_ = nodeCount; - setCoreParameter("NodeCount", std::to_string(nodeCount)); + setParameter("NodeCount", std::to_string(nodeCount)); } diff --git a/hbase/src/model/RestartInstanceRequest.cc b/hbase/src/model/RestartInstanceRequest.cc index ca03900a0..e25204ebc 100644 --- a/hbase/src/model/RestartInstanceRequest.cc +++ b/hbase/src/model/RestartInstanceRequest.cc @@ -35,7 +35,7 @@ std::string RestartInstanceRequest::getComponents()const void RestartInstanceRequest::setComponents(const std::string& components) { components_ = components; - setCoreParameter("Components", components); + setParameter("Components", components); } std::string RestartInstanceRequest::getClusterId()const @@ -46,6 +46,6 @@ std::string RestartInstanceRequest::getClusterId()const void RestartInstanceRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } diff --git a/hbase/src/model/SwitchHbaseHaSlbRequest.cc b/hbase/src/model/SwitchHbaseHaSlbRequest.cc index 16685b4e1..44b89d00a 100644 --- a/hbase/src/model/SwitchHbaseHaSlbRequest.cc +++ b/hbase/src/model/SwitchHbaseHaSlbRequest.cc @@ -35,7 +35,7 @@ std::string SwitchHbaseHaSlbRequest::getHaTypes()const void SwitchHbaseHaSlbRequest::setHaTypes(const std::string& haTypes) { haTypes_ = haTypes; - setCoreParameter("HaTypes", haTypes); + setParameter("HaTypes", haTypes); } std::string SwitchHbaseHaSlbRequest::getHbaseType()const @@ -46,7 +46,7 @@ std::string SwitchHbaseHaSlbRequest::getHbaseType()const void SwitchHbaseHaSlbRequest::setHbaseType(const std::string& hbaseType) { hbaseType_ = hbaseType; - setCoreParameter("HbaseType", hbaseType); + setParameter("HbaseType", hbaseType); } std::string SwitchHbaseHaSlbRequest::getBdsId()const @@ -57,7 +57,7 @@ std::string SwitchHbaseHaSlbRequest::getBdsId()const void SwitchHbaseHaSlbRequest::setBdsId(const std::string& bdsId) { bdsId_ = bdsId; - setCoreParameter("BdsId", bdsId); + setParameter("BdsId", bdsId); } std::string SwitchHbaseHaSlbRequest::getHaId()const @@ -68,6 +68,6 @@ std::string SwitchHbaseHaSlbRequest::getHaId()const void SwitchHbaseHaSlbRequest::setHaId(const std::string& haId) { haId_ = haId; - setCoreParameter("HaId", haId); + setParameter("HaId", haId); } diff --git a/hbase/src/model/TagResourcesRequest.cc b/hbase/src/model/TagResourcesRequest.cc index c6fb038bd..b045a9289 100644 --- a/hbase/src/model/TagResourcesRequest.cc +++ b/hbase/src/model/TagResourcesRequest.cc @@ -36,7 +36,7 @@ void TagResourcesRequest::setResourceId(const std::vector& resource { resourceId_ = resourceId; for(int dep1 = 0; dep1!= resourceId.size(); dep1++) { - setCoreParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); + setParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); } } @@ -48,7 +48,7 @@ std::string TagResourcesRequest::getRegionId()const void TagResourcesRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } std::vector TagResourcesRequest::getTag()const @@ -61,9 +61,9 @@ void TagResourcesRequest::setTag(const std::vector& tag) tag_ = tag; for(int dep1 = 0; dep1!= tag.size(); dep1++) { auto tagObj = tag.at(dep1); - std::string tagObjStr = "Tag." + std::to_string(dep1); - setCoreParameter(tagObjStr + ".Value", tagObj.value); - setCoreParameter(tagObjStr + ".Key", tagObj.key); + std::string tagObjStr = "Tag." + std::to_string(dep1 + 1); + setParameter(tagObjStr + ".Value", tagObj.value); + setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/hbase/src/model/UnTagResourcesRequest.cc b/hbase/src/model/UnTagResourcesRequest.cc index abcae1a48..87e743a83 100644 --- a/hbase/src/model/UnTagResourcesRequest.cc +++ b/hbase/src/model/UnTagResourcesRequest.cc @@ -35,7 +35,7 @@ std::string UnTagResourcesRequest::getRegionId()const void UnTagResourcesRequest::setRegionId(const std::string& regionId) { regionId_ = regionId; - setCoreParameter("RegionId", regionId); + setParameter("RegionId", regionId); } bool UnTagResourcesRequest::getAll()const @@ -46,7 +46,7 @@ bool UnTagResourcesRequest::getAll()const void UnTagResourcesRequest::setAll(bool all) { all_ = all; - setCoreParameter("All", all ? "true" : "false"); + setParameter("All", all ? "true" : "false"); } std::vector UnTagResourcesRequest::getResourceId()const @@ -58,7 +58,7 @@ void UnTagResourcesRequest::setResourceId(const std::vector& resour { resourceId_ = resourceId; for(int dep1 = 0; dep1!= resourceId.size(); dep1++) { - setCoreParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); + setParameter("ResourceId."+ std::to_string(dep1), resourceId.at(dep1)); } } @@ -71,7 +71,7 @@ void UnTagResourcesRequest::setTagKey(const std::vector& tagKey) { tagKey_ = tagKey; for(int dep1 = 0; dep1!= tagKey.size(); dep1++) { - setCoreParameter("TagKey."+ std::to_string(dep1), tagKey.at(dep1)); + setParameter("TagKey."+ std::to_string(dep1), tagKey.at(dep1)); } } diff --git a/hbase/src/model/XpackRelateDBRequest.cc b/hbase/src/model/XpackRelateDBRequest.cc index 3bdc53ba1..1193551ba 100644 --- a/hbase/src/model/XpackRelateDBRequest.cc +++ b/hbase/src/model/XpackRelateDBRequest.cc @@ -35,7 +35,7 @@ std::string XpackRelateDBRequest::getClusterId()const void XpackRelateDBRequest::setClusterId(const std::string& clusterId) { clusterId_ = clusterId; - setCoreParameter("ClusterId", clusterId); + setParameter("ClusterId", clusterId); } std::string XpackRelateDBRequest::getRelateDbType()const @@ -46,7 +46,7 @@ std::string XpackRelateDBRequest::getRelateDbType()const void XpackRelateDBRequest::setRelateDbType(const std::string& relateDbType) { relateDbType_ = relateDbType; - setCoreParameter("RelateDbType", relateDbType); + setParameter("RelateDbType", relateDbType); } std::string XpackRelateDBRequest::getDbClusterIds()const @@ -57,6 +57,6 @@ std::string XpackRelateDBRequest::getDbClusterIds()const void XpackRelateDBRequest::setDbClusterIds(const std::string& dbClusterIds) { dbClusterIds_ = dbClusterIds; - setCoreParameter("DbClusterIds", dbClusterIds); + setParameter("DbClusterIds", dbClusterIds); }