diff --git a/CHANGELOG b/CHANGELOG index 6bd3db704..b6280240c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-11-18 Version: patch +- DescribeInstance support coldStorageSize. + 2020-11-18 Version: patch - Update DescribeDedicatedClusterInstanceList InstanceStatus type. diff --git a/hbase/CMakeLists.txt b/hbase/CMakeLists.txt index 979550bbc..89b4c179d 100644 --- a/hbase/CMakeLists.txt +++ b/hbase/CMakeLists.txt @@ -155,6 +155,8 @@ set(hbase_public_header_model include/alibabacloud/hbase/model/TagResourcesResult.h include/alibabacloud/hbase/model/UnTagResourcesRequest.h include/alibabacloud/hbase/model/UnTagResourcesResult.h + include/alibabacloud/hbase/model/UpgradeMinorVersionRequest.h + include/alibabacloud/hbase/model/UpgradeMinorVersionResult.h include/alibabacloud/hbase/model/UpgradeMultiZoneClusterRequest.h include/alibabacloud/hbase/model/UpgradeMultiZoneClusterResult.h include/alibabacloud/hbase/model/XpackRelateDBRequest.h @@ -296,6 +298,8 @@ set(hbase_src src/model/TagResourcesResult.cc src/model/UnTagResourcesRequest.cc src/model/UnTagResourcesResult.cc + src/model/UpgradeMinorVersionRequest.cc + src/model/UpgradeMinorVersionResult.cc src/model/UpgradeMultiZoneClusterRequest.cc src/model/UpgradeMultiZoneClusterResult.cc src/model/XpackRelateDBRequest.cc diff --git a/hbase/include/alibabacloud/hbase/HBaseClient.h b/hbase/include/alibabacloud/hbase/HBaseClient.h index 6b09d425f..df9bff248 100644 --- a/hbase/include/alibabacloud/hbase/HBaseClient.h +++ b/hbase/include/alibabacloud/hbase/HBaseClient.h @@ -156,6 +156,8 @@ #include "model/TagResourcesResult.h" #include "model/UnTagResourcesRequest.h" #include "model/UnTagResourcesResult.h" +#include "model/UpgradeMinorVersionRequest.h" +#include "model/UpgradeMinorVersionResult.h" #include "model/UpgradeMultiZoneClusterRequest.h" #include "model/UpgradeMultiZoneClusterResult.h" #include "model/XpackRelateDBRequest.h" @@ -370,6 +372,9 @@ namespace AlibabaCloud typedef Outcome UnTagResourcesOutcome; typedef std::future UnTagResourcesOutcomeCallable; typedef std::function&)> UnTagResourcesAsyncHandler; + typedef Outcome UpgradeMinorVersionOutcome; + typedef std::future UpgradeMinorVersionOutcomeCallable; + typedef std::function&)> UpgradeMinorVersionAsyncHandler; typedef Outcome UpgradeMultiZoneClusterOutcome; typedef std::future UpgradeMultiZoneClusterOutcomeCallable; typedef std::function&)> UpgradeMultiZoneClusterAsyncHandler; @@ -582,6 +587,9 @@ namespace AlibabaCloud UnTagResourcesOutcome unTagResources(const Model::UnTagResourcesRequest &request)const; void unTagResourcesAsync(const Model::UnTagResourcesRequest& request, const UnTagResourcesAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; UnTagResourcesOutcomeCallable unTagResourcesCallable(const Model::UnTagResourcesRequest& request) const; + UpgradeMinorVersionOutcome upgradeMinorVersion(const Model::UpgradeMinorVersionRequest &request)const; + void upgradeMinorVersionAsync(const Model::UpgradeMinorVersionRequest& request, const UpgradeMinorVersionAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + UpgradeMinorVersionOutcomeCallable upgradeMinorVersionCallable(const Model::UpgradeMinorVersionRequest& request) const; UpgradeMultiZoneClusterOutcome upgradeMultiZoneCluster(const Model::UpgradeMultiZoneClusterRequest &request)const; void upgradeMultiZoneClusterAsync(const Model::UpgradeMultiZoneClusterRequest& request, const UpgradeMultiZoneClusterAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; UpgradeMultiZoneClusterOutcomeCallable upgradeMultiZoneClusterCallable(const Model::UpgradeMultiZoneClusterRequest& request) const; diff --git a/hbase/include/alibabacloud/hbase/model/AddUserHdfsInfoRequest.h b/hbase/include/alibabacloud/hbase/model/AddUserHdfsInfoRequest.h index 8e4690f85..c4fa5440b 100644 --- a/hbase/include/alibabacloud/hbase/model/AddUserHdfsInfoRequest.h +++ b/hbase/include/alibabacloud/hbase/model/AddUserHdfsInfoRequest.h @@ -37,11 +37,14 @@ namespace AlibabaCloud std::string getExtInfo()const; void setExtInfo(const std::string& extInfo); + std::string getClientToken()const; + void setClientToken(const std::string& clientToken); std::string getClusterId()const; void setClusterId(const std::string& clusterId); private: std::string extInfo_; + std::string clientToken_; std::string clusterId_; }; diff --git a/hbase/include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h b/hbase/include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h index 865dc09ad..00d981bc4 100644 --- a/hbase/include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h +++ b/hbase/include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud CreateHbaseHaSlbRequest(); ~CreateHbaseHaSlbRequest(); + std::string getClientToken()const; + void setClientToken(const std::string& clientToken); std::string getHaTypes()const; void setHaTypes(const std::string& haTypes); std::string getHbaseType()const; @@ -45,6 +47,7 @@ namespace AlibabaCloud void setHaId(const std::string& haId); private: + std::string clientToken_; std::string haTypes_; std::string hbaseType_; std::string bdsId_; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h index 6e102dd67..219369c6d 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h @@ -61,6 +61,7 @@ namespace AlibabaCloud std::string getMajorVersion()const; std::string getCoreDiskCount()const; std::string getParentId()const; + int getColdStorageSize()const; int getMasterDiskSize()const; std::string getExpireTimeUTC()const; std::string getZoneId()const; @@ -107,6 +108,7 @@ namespace AlibabaCloud std::string majorVersion_; std::string coreDiskCount_; std::string parentId_; + int coldStorageSize_; int masterDiskSize_; std::string expireTimeUTC_; std::string zoneId_; diff --git a/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionRequest.h b/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionRequest.h new file mode 100644 index 000000000..32603b9eb --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionRequest.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_UPGRADEMINORVERSIONREQUEST_H_ +#define ALIBABACLOUD_HBASE_MODEL_UPGRADEMINORVERSIONREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT UpgradeMinorVersionRequest : public RpcServiceRequest + { + + public: + UpgradeMinorVersionRequest(); + ~UpgradeMinorVersionRequest(); + + std::string getComponents()const; + void setComponents(const std::string& components); + std::string getClusterId()const; + void setClusterId(const std::string& clusterId); + + private: + std::string components_; + std::string clusterId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_UPGRADEMINORVERSIONREQUEST_H_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionResult.h b/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionResult.h new file mode 100644 index 000000000..72f41f4b0 --- /dev/null +++ b/hbase/include/alibabacloud/hbase/model/UpgradeMinorVersionResult.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_UPGRADEMINORVERSIONRESULT_H_ +#define ALIBABACLOUD_HBASE_MODEL_UPGRADEMINORVERSIONRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace HBase + { + namespace Model + { + class ALIBABACLOUD_HBASE_EXPORT UpgradeMinorVersionResult : public ServiceResult + { + public: + + + UpgradeMinorVersionResult(); + explicit UpgradeMinorVersionResult(const std::string &payload); + ~UpgradeMinorVersionResult(); + std::string getUpgradingComponents()const; + + protected: + void parse(const std::string &payload); + private: + std::string upgradingComponents_; + + }; + } + } +} +#endif // !ALIBABACLOUD_HBASE_MODEL_UPGRADEMINORVERSIONRESULT_H_ \ No newline at end of file diff --git a/hbase/src/HBaseClient.cc b/hbase/src/HBaseClient.cc index 34da02dad..61a3242a2 100644 --- a/hbase/src/HBaseClient.cc +++ b/hbase/src/HBaseClient.cc @@ -2463,6 +2463,42 @@ HBaseClient::UnTagResourcesOutcomeCallable HBaseClient::unTagResourcesCallable(c return task->get_future(); } +HBaseClient::UpgradeMinorVersionOutcome HBaseClient::upgradeMinorVersion(const UpgradeMinorVersionRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return UpgradeMinorVersionOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return UpgradeMinorVersionOutcome(UpgradeMinorVersionResult(outcome.result())); + else + return UpgradeMinorVersionOutcome(outcome.error()); +} + +void HBaseClient::upgradeMinorVersionAsync(const UpgradeMinorVersionRequest& request, const UpgradeMinorVersionAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, upgradeMinorVersion(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +HBaseClient::UpgradeMinorVersionOutcomeCallable HBaseClient::upgradeMinorVersionCallable(const UpgradeMinorVersionRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->upgradeMinorVersion(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + HBaseClient::UpgradeMultiZoneClusterOutcome HBaseClient::upgradeMultiZoneCluster(const UpgradeMultiZoneClusterRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/hbase/src/model/AddUserHdfsInfoRequest.cc b/hbase/src/model/AddUserHdfsInfoRequest.cc index 6f1800f98..aac14f714 100644 --- a/hbase/src/model/AddUserHdfsInfoRequest.cc +++ b/hbase/src/model/AddUserHdfsInfoRequest.cc @@ -38,6 +38,17 @@ void AddUserHdfsInfoRequest::setExtInfo(const std::string& extInfo) setParameter("ExtInfo", extInfo); } +std::string AddUserHdfsInfoRequest::getClientToken()const +{ + return clientToken_; +} + +void AddUserHdfsInfoRequest::setClientToken(const std::string& clientToken) +{ + clientToken_ = clientToken; + setParameter("ClientToken", clientToken); +} + std::string AddUserHdfsInfoRequest::getClusterId()const { return clusterId_; diff --git a/hbase/src/model/CreateHbaseHaSlbRequest.cc b/hbase/src/model/CreateHbaseHaSlbRequest.cc index 90072fb5f..a87be8616 100644 --- a/hbase/src/model/CreateHbaseHaSlbRequest.cc +++ b/hbase/src/model/CreateHbaseHaSlbRequest.cc @@ -27,6 +27,17 @@ CreateHbaseHaSlbRequest::CreateHbaseHaSlbRequest() : CreateHbaseHaSlbRequest::~CreateHbaseHaSlbRequest() {} +std::string CreateHbaseHaSlbRequest::getClientToken()const +{ + return clientToken_; +} + +void CreateHbaseHaSlbRequest::setClientToken(const std::string& clientToken) +{ + clientToken_ = clientToken; + setParameter("ClientToken", clientToken); +} + std::string CreateHbaseHaSlbRequest::getHaTypes()const { return haTypes_; diff --git a/hbase/src/model/DescribeAvailableResourceResult.cc b/hbase/src/model/DescribeAvailableResourceResult.cc index 444710061..5a6d4710f 100644 --- a/hbase/src/model/DescribeAvailableResourceResult.cc +++ b/hbase/src/model/DescribeAvailableResourceResult.cc @@ -47,38 +47,38 @@ void DescribeAvailableResourceResult::parse(const std::string &payload) availableZonesObject.regionId = valueAvailableZonesAvailableZone["RegionId"].asString(); if(!valueAvailableZonesAvailableZone["ZoneId"].isNull()) availableZonesObject.zoneId = valueAvailableZonesAvailableZone["ZoneId"].asString(); - auto allSupportedEnginesNode = allAvailableZonesNode["SupportedEngines"]["SupportedEngine"]; - for (auto allAvailableZonesNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode) + auto allSupportedEnginesNode = valueAvailableZonesAvailableZone["SupportedEngines"]["SupportedEngine"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine : allSupportedEnginesNode) { AvailableZone::SupportedEngine supportedEnginesObject; - if(!allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].isNull()) - supportedEnginesObject.engine = allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].asString(); - auto allSupportedEngineVersionsNode = allSupportedEnginesNode["SupportedEngineVersions"]["SupportedEngineVersion"]; - for (auto allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].isNull()) + supportedEnginesObject.engine = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].asString(); + auto allSupportedEngineVersionsNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["SupportedEngineVersions"]["SupportedEngineVersion"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode) { AvailableZone::SupportedEngine::SupportedEngineVersion supportedEngineVersionsObject; - if(!allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].isNull()) - supportedEngineVersionsObject.version = allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].asString(); - auto allSupportedCategoriesNode = allSupportedEngineVersionsNode["SupportedCategories"]["SupportedCategoriesItem"]; - for (auto allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["Version"].isNull()) + supportedEngineVersionsObject.version = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["Version"].asString(); + auto allSupportedCategoriesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["SupportedCategories"]["SupportedCategoriesItem"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem supportedCategoriesObject; - if(!allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].isNull()) - supportedCategoriesObject.category = allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].asString(); - auto allSupportedStorageTypesNode = allSupportedCategoriesNode["SupportedStorageTypes"]["SupportedStorageType"]; - for (auto allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["Category"].isNull()) + supportedCategoriesObject.category = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["Category"].asString(); + auto allSupportedStorageTypesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["SupportedStorageTypes"]["SupportedStorageType"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType supportedStorageTypesObject; - if(!allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].isNull()) - supportedStorageTypesObject.storageType = allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].asString(); - auto allCoreResourcesNode = allSupportedStorageTypesNode["CoreResources"]["CoreResource"]; - for (auto allSupportedStorageTypesNodeCoreResourcesCoreResource : allCoreResourcesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["StorageType"].isNull()) + supportedStorageTypesObject.storageType = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["StorageType"].asString(); + auto allCoreResourcesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["CoreResources"]["CoreResource"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource : allCoreResourcesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType::CoreResource coreResourcesObject; - if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].isNull()) - coreResourcesObject.instanceType = allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].asString(); - if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["MaxCoreCount"].isNull()) - coreResourcesObject.maxCoreCount = std::stoi(allSupportedStorageTypesNodeCoreResourcesCoreResource["MaxCoreCount"].asString()); + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["InstanceType"].isNull()) + coreResourcesObject.instanceType = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["InstanceType"].asString(); + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["MaxCoreCount"].isNull()) + coreResourcesObject.maxCoreCount = std::stoi(valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["MaxCoreCount"].asString()); auto dBInstanceStorageRangeNode = value["DBInstanceStorageRange"]; if(!dBInstanceStorageRangeNode["MaxSize"].isNull()) coreResourcesObject.dBInstanceStorageRange.maxSize = std::stoi(dBInstanceStorageRangeNode["MaxSize"].asString()); @@ -101,12 +101,12 @@ void DescribeAvailableResourceResult::parse(const std::string &payload) } availableZonesObject.supportedEngines.push_back(supportedEnginesObject); } - auto allMasterResourcesNode = allAvailableZonesNode["MasterResources"]["MasterResource"]; - for (auto allAvailableZonesNodeMasterResourcesMasterResource : allMasterResourcesNode) + auto allMasterResourcesNode = valueAvailableZonesAvailableZone["MasterResources"]["MasterResource"]; + for (auto valueAvailableZonesAvailableZoneMasterResourcesMasterResource : allMasterResourcesNode) { AvailableZone::MasterResource masterResourcesObject; - if(!allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].isNull()) - masterResourcesObject.instanceType = allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].asString(); + if(!valueAvailableZonesAvailableZoneMasterResourcesMasterResource["InstanceType"].isNull()) + masterResourcesObject.instanceType = valueAvailableZonesAvailableZoneMasterResourcesMasterResource["InstanceType"].asString(); auto instanceTypeDetail1Node = value["InstanceTypeDetail"]; if(!instanceTypeDetail1Node["Cpu"].isNull()) masterResourcesObject.instanceTypeDetail1.cpu = std::stoi(instanceTypeDetail1Node["Cpu"].asString()); diff --git a/hbase/src/model/DescribeInstanceResult.cc b/hbase/src/model/DescribeInstanceResult.cc index 3c5e6fa3f..b0ddfb254 100644 --- a/hbase/src/model/DescribeInstanceResult.cc +++ b/hbase/src/model/DescribeInstanceResult.cc @@ -131,6 +131,8 @@ void DescribeInstanceResult::parse(const std::string &payload) autoRenewal_ = value["AutoRenewal"].asString() == "true"; if(!value["Duration"].isNull()) duration_ = std::stoi(value["Duration"].asString()); + if(!value["ColdStorageSize"].isNull()) + coldStorageSize_ = std::stoi(value["ColdStorageSize"].asString()); } @@ -229,6 +231,11 @@ std::string DescribeInstanceResult::getParentId()const return parentId_; } +int DescribeInstanceResult::getColdStorageSize()const +{ + return coldStorageSize_; +} + int DescribeInstanceResult::getMasterDiskSize()const { return masterDiskSize_; diff --git a/hbase/src/model/DescribeInstancesResult.cc b/hbase/src/model/DescribeInstancesResult.cc index fb472670e..81d2f3692 100644 --- a/hbase/src/model/DescribeInstancesResult.cc +++ b/hbase/src/model/DescribeInstancesResult.cc @@ -115,14 +115,14 @@ void DescribeInstancesResult::parse(const std::string &payload) instancesObject.autoRenewal = valueInstancesInstance["AutoRenewal"].asString() == "true"; if(!valueInstancesInstance["Duration"].isNull()) instancesObject.duration = std::stoi(valueInstancesInstance["Duration"].asString()); - auto allTagsNode = allInstancesNode["Tags"]["Tag"]; - for (auto allInstancesNodeTagsTag : allTagsNode) + auto allTagsNode = valueInstancesInstance["Tags"]["Tag"]; + for (auto valueInstancesInstanceTagsTag : allTagsNode) { Instance::Tag tagsObject; - if(!allInstancesNodeTagsTag["Key"].isNull()) - tagsObject.key = allInstancesNodeTagsTag["Key"].asString(); - if(!allInstancesNodeTagsTag["Value"].isNull()) - tagsObject.value = allInstancesNodeTagsTag["Value"].asString(); + if(!valueInstancesInstanceTagsTag["Key"].isNull()) + tagsObject.key = valueInstancesInstanceTagsTag["Key"].asString(); + if(!valueInstancesInstanceTagsTag["Value"].isNull()) + tagsObject.value = valueInstancesInstanceTagsTag["Value"].asString(); instancesObject.tags.push_back(tagsObject); } instances_.push_back(instancesObject); diff --git a/hbase/src/model/DescribeMultiZoneAvailableRegionsResult.cc b/hbase/src/model/DescribeMultiZoneAvailableRegionsResult.cc index 548c95b46..933ff6f6c 100644 --- a/hbase/src/model/DescribeMultiZoneAvailableRegionsResult.cc +++ b/hbase/src/model/DescribeMultiZoneAvailableRegionsResult.cc @@ -49,12 +49,12 @@ void DescribeMultiZoneAvailableRegionsResult::parse(const std::string &payload) regionsObject.regionEndpoint = valueRegionsRegion["RegionEndpoint"].asString(); if(!valueRegionsRegion["RegionId"].isNull()) regionsObject.regionId = valueRegionsRegion["RegionId"].asString(); - auto allAvailableCombinesNode = allRegionsNode["AvailableCombines"]["AvailableCombine"]; - for (auto allRegionsNodeAvailableCombinesAvailableCombine : allAvailableCombinesNode) + auto allAvailableCombinesNode = valueRegionsRegion["AvailableCombines"]["AvailableCombine"]; + for (auto valueRegionsRegionAvailableCombinesAvailableCombine : allAvailableCombinesNode) { Region::AvailableCombine availableCombinesObject; - if(!allRegionsNodeAvailableCombinesAvailableCombine["Id"].isNull()) - availableCombinesObject.id = allRegionsNodeAvailableCombinesAvailableCombine["Id"].asString(); + if(!valueRegionsRegionAvailableCombinesAvailableCombine["Id"].isNull()) + availableCombinesObject.id = valueRegionsRegionAvailableCombinesAvailableCombine["Id"].asString(); auto allZones = value["Zones"]["Zone"]; for (auto value : allZones) availableCombinesObject.zones.push_back(value.asString()); diff --git a/hbase/src/model/DescribeMultiZoneAvailableResourceResult.cc b/hbase/src/model/DescribeMultiZoneAvailableResourceResult.cc index 6fe9cf509..9f164c22f 100644 --- a/hbase/src/model/DescribeMultiZoneAvailableResourceResult.cc +++ b/hbase/src/model/DescribeMultiZoneAvailableResourceResult.cc @@ -47,12 +47,12 @@ void DescribeMultiZoneAvailableResourceResult::parse(const std::string &payload) availableZonesObject.regionId = valueAvailableZonesAvailableZone["RegionId"].asString(); if(!valueAvailableZonesAvailableZone["ZoneCombination"].isNull()) availableZonesObject.zoneCombination = valueAvailableZonesAvailableZone["ZoneCombination"].asString(); - auto allMasterResourcesNode = allAvailableZonesNode["MasterResources"]["MasterResource"]; - for (auto allAvailableZonesNodeMasterResourcesMasterResource : allMasterResourcesNode) + auto allMasterResourcesNode = valueAvailableZonesAvailableZone["MasterResources"]["MasterResource"]; + for (auto valueAvailableZonesAvailableZoneMasterResourcesMasterResource : allMasterResourcesNode) { AvailableZone::MasterResource masterResourcesObject; - if(!allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].isNull()) - masterResourcesObject.instanceType = allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].asString(); + if(!valueAvailableZonesAvailableZoneMasterResourcesMasterResource["InstanceType"].isNull()) + masterResourcesObject.instanceType = valueAvailableZonesAvailableZoneMasterResourcesMasterResource["InstanceType"].asString(); auto instanceTypeDetailNode = value["InstanceTypeDetail"]; if(!instanceTypeDetailNode["Cpu"].isNull()) masterResourcesObject.instanceTypeDetail.cpu = std::stoi(instanceTypeDetailNode["Cpu"].asString()); @@ -60,38 +60,38 @@ void DescribeMultiZoneAvailableResourceResult::parse(const std::string &payload) masterResourcesObject.instanceTypeDetail.mem = std::stoi(instanceTypeDetailNode["Mem"].asString()); availableZonesObject.masterResources.push_back(masterResourcesObject); } - auto allSupportedEnginesNode = allAvailableZonesNode["SupportedEngines"]["SupportedEngine"]; - for (auto allAvailableZonesNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode) + auto allSupportedEnginesNode = valueAvailableZonesAvailableZone["SupportedEngines"]["SupportedEngine"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine : allSupportedEnginesNode) { AvailableZone::SupportedEngine supportedEnginesObject; - if(!allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].isNull()) - supportedEnginesObject.engine = allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].asString(); - auto allSupportedEngineVersionsNode = allSupportedEnginesNode["SupportedEngineVersions"]["SupportedEngineVersion"]; - for (auto allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].isNull()) + supportedEnginesObject.engine = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].asString(); + auto allSupportedEngineVersionsNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["SupportedEngineVersions"]["SupportedEngineVersion"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode) { AvailableZone::SupportedEngine::SupportedEngineVersion supportedEngineVersionsObject; - if(!allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].isNull()) - supportedEngineVersionsObject.version = allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].asString(); - auto allSupportedCategoriesNode = allSupportedEngineVersionsNode["SupportedCategories"]["SupportedCategoriesItem"]; - for (auto allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["Version"].isNull()) + supportedEngineVersionsObject.version = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["Version"].asString(); + auto allSupportedCategoriesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersion["SupportedCategories"]["SupportedCategoriesItem"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem supportedCategoriesObject; - if(!allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].isNull()) - supportedCategoriesObject.category = allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].asString(); - auto allSupportedStorageTypesNode = allSupportedCategoriesNode["SupportedStorageTypes"]["SupportedStorageType"]; - for (auto allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["Category"].isNull()) + supportedCategoriesObject.category = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["Category"].asString(); + auto allSupportedStorageTypesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItem["SupportedStorageTypes"]["SupportedStorageType"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType supportedStorageTypesObject; - if(!allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].isNull()) - supportedStorageTypesObject.storageType = allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].asString(); - auto allCoreResourcesNode = allSupportedStorageTypesNode["CoreResources"]["CoreResource"]; - for (auto allSupportedStorageTypesNodeCoreResourcesCoreResource : allCoreResourcesNode) + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["StorageType"].isNull()) + supportedStorageTypesObject.storageType = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["StorageType"].asString(); + auto allCoreResourcesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageType["CoreResources"]["CoreResource"]; + for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource : allCoreResourcesNode) { AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType::CoreResource coreResourcesObject; - if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].isNull()) - coreResourcesObject.instanceType = allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].asString(); - if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["MaxCoreCount"].isNull()) - coreResourcesObject.maxCoreCount = std::stoi(allSupportedStorageTypesNodeCoreResourcesCoreResource["MaxCoreCount"].asString()); + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["InstanceType"].isNull()) + coreResourcesObject.instanceType = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["InstanceType"].asString(); + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["MaxCoreCount"].isNull()) + coreResourcesObject.maxCoreCount = std::stoi(valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEngineVersionsSupportedEngineVersionSupportedCategoriesSupportedCategoriesItemSupportedStorageTypesSupportedStorageTypeCoreResourcesCoreResource["MaxCoreCount"].asString()); auto dBInstanceStorageRangeNode = value["DBInstanceStorageRange"]; if(!dBInstanceStorageRangeNode["MaxSize"].isNull()) coreResourcesObject.dBInstanceStorageRange.maxSize = std::stoi(dBInstanceStorageRangeNode["MaxSize"].asString()); diff --git a/hbase/src/model/DescribeRegionsResult.cc b/hbase/src/model/DescribeRegionsResult.cc index 6680b0472..f43798fdc 100644 --- a/hbase/src/model/DescribeRegionsResult.cc +++ b/hbase/src/model/DescribeRegionsResult.cc @@ -49,12 +49,12 @@ void DescribeRegionsResult::parse(const std::string &payload) regionsObject.localName = valueRegionsRegion["LocalName"].asString(); if(!valueRegionsRegion["RegionEndpoint"].isNull()) regionsObject.regionEndpoint = valueRegionsRegion["RegionEndpoint"].asString(); - auto allZonesNode = allRegionsNode["Zones"]["Zone"]; - for (auto allRegionsNodeZonesZone : allZonesNode) + auto allZonesNode = valueRegionsRegion["Zones"]["Zone"]; + for (auto valueRegionsRegionZonesZone : allZonesNode) { Region::Zone zonesObject; - if(!allRegionsNodeZonesZone["Id"].isNull()) - zonesObject.id = allRegionsNodeZonesZone["Id"].asString(); + if(!valueRegionsRegionZonesZone["Id"].isNull()) + zonesObject.id = valueRegionsRegionZonesZone["Id"].asString(); regionsObject.zones.push_back(zonesObject); } regions_.push_back(regionsObject); diff --git a/hbase/src/model/QueryHBaseHaDBResult.cc b/hbase/src/model/QueryHBaseHaDBResult.cc index 4a4458a55..104e859aa 100644 --- a/hbase/src/model/QueryHBaseHaDBResult.cc +++ b/hbase/src/model/QueryHBaseHaDBResult.cc @@ -51,16 +51,16 @@ void QueryHBaseHaDBResult::parse(const std::string &payload) clusterListObject.activeName = valueClusterListCluster["ActiveName"].asString(); if(!valueClusterListCluster["StandbyName"].isNull()) clusterListObject.standbyName = valueClusterListCluster["StandbyName"].asString(); - auto allHaSlbConnListNode = allClusterListNode["HaSlbConnList"]["HaSlbConn"]; - for (auto allClusterListNodeHaSlbConnListHaSlbConn : allHaSlbConnListNode) + auto allHaSlbConnListNode = valueClusterListCluster["HaSlbConnList"]["HaSlbConn"]; + for (auto valueClusterListClusterHaSlbConnListHaSlbConn : allHaSlbConnListNode) { Cluster::HaSlbConn haSlbConnListObject; - if(!allClusterListNodeHaSlbConnListHaSlbConn["SlbType"].isNull()) - haSlbConnListObject.slbType = allClusterListNodeHaSlbConnListHaSlbConn["SlbType"].asString(); - if(!allClusterListNodeHaSlbConnListHaSlbConn["SlbConnAddr"].isNull()) - haSlbConnListObject.slbConnAddr = allClusterListNodeHaSlbConnListHaSlbConn["SlbConnAddr"].asString(); - if(!allClusterListNodeHaSlbConnListHaSlbConn["HbaseType"].isNull()) - haSlbConnListObject.hbaseType = allClusterListNodeHaSlbConnListHaSlbConn["HbaseType"].asString(); + if(!valueClusterListClusterHaSlbConnListHaSlbConn["SlbType"].isNull()) + haSlbConnListObject.slbType = valueClusterListClusterHaSlbConnListHaSlbConn["SlbType"].asString(); + if(!valueClusterListClusterHaSlbConnListHaSlbConn["SlbConnAddr"].isNull()) + haSlbConnListObject.slbConnAddr = valueClusterListClusterHaSlbConnListHaSlbConn["SlbConnAddr"].asString(); + if(!valueClusterListClusterHaSlbConnListHaSlbConn["HbaseType"].isNull()) + haSlbConnListObject.hbaseType = valueClusterListClusterHaSlbConnListHaSlbConn["HbaseType"].asString(); clusterListObject.haSlbConnList.push_back(haSlbConnListObject); } clusterList_.push_back(clusterListObject); diff --git a/hbase/src/model/UpgradeMinorVersionRequest.cc b/hbase/src/model/UpgradeMinorVersionRequest.cc new file mode 100644 index 000000000..a374fa440 --- /dev/null +++ b/hbase/src/model/UpgradeMinorVersionRequest.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::UpgradeMinorVersionRequest; + +UpgradeMinorVersionRequest::UpgradeMinorVersionRequest() : + RpcServiceRequest("hbase", "2019-01-01", "UpgradeMinorVersion") +{ + setMethod(HttpRequest::Method::Post); +} + +UpgradeMinorVersionRequest::~UpgradeMinorVersionRequest() +{} + +std::string UpgradeMinorVersionRequest::getComponents()const +{ + return components_; +} + +void UpgradeMinorVersionRequest::setComponents(const std::string& components) +{ + components_ = components; + setParameter("Components", components); +} + +std::string UpgradeMinorVersionRequest::getClusterId()const +{ + return clusterId_; +} + +void UpgradeMinorVersionRequest::setClusterId(const std::string& clusterId) +{ + clusterId_ = clusterId; + setParameter("ClusterId", clusterId); +} + diff --git a/hbase/src/model/UpgradeMinorVersionResult.cc b/hbase/src/model/UpgradeMinorVersionResult.cc new file mode 100644 index 000000000..c00be6835 --- /dev/null +++ b/hbase/src/model/UpgradeMinorVersionResult.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 +#include + +using namespace AlibabaCloud::HBase; +using namespace AlibabaCloud::HBase::Model; + +UpgradeMinorVersionResult::UpgradeMinorVersionResult() : + ServiceResult() +{} + +UpgradeMinorVersionResult::UpgradeMinorVersionResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +UpgradeMinorVersionResult::~UpgradeMinorVersionResult() +{} + +void UpgradeMinorVersionResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["UpgradingComponents"].isNull()) + upgradingComponents_ = value["UpgradingComponents"].asString(); + +} + +std::string UpgradeMinorVersionResult::getUpgradingComponents()const +{ + return upgradingComponents_; +} +