From 109a8805521e01d1656d00b1fc20e0c99fb3a761 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Thu, 12 Aug 2021 03:30:28 +0000 Subject: [PATCH] DescirbeAvailableResource add NodeId input parameter. --- CHANGELOG | 4 ++++ VERSION | 2 +- .../model/CreateTairInstanceRequest.h | 3 +++ .../model/DescribeAvailableResourceRequest.h | 3 +++ .../model/DescribeAvailableResourceResult.h | 1 + .../model/DescribeEngineVersionResult.h | 6 ++++++ .../src/model/CreateTairInstanceRequest.cc | 11 ++++++++++ .../model/DescribeAvailableResourceRequest.cc | 11 ++++++++++ .../model/DescribeAvailableResourceResult.cc | 2 ++ .../src/model/DescribeEngineVersionResult.cc | 21 +++++++++++++++++++ 10 files changed, 63 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ce8661ff4..9e1a37d5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2021-08-12 Version: 1.36.849 +- DescirbeAvailableResource add NodeId input parameter. +- CreateTairInstance add GlobalInstanceId input paramter. + 2021-08-11 Version: 1.36.848 - Support CEN latest Apis. diff --git a/VERSION b/VERSION index 652f851b1..b0731212b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.848 \ No newline at end of file +1.36.849 \ No newline at end of file diff --git a/r-kvstore/include/alibabacloud/r-kvstore/model/CreateTairInstanceRequest.h b/r-kvstore/include/alibabacloud/r-kvstore/model/CreateTairInstanceRequest.h index e6b36ccff..0dfee8f9d 100644 --- a/r-kvstore/include/alibabacloud/r-kvstore/model/CreateTairInstanceRequest.h +++ b/r-kvstore/include/alibabacloud/r-kvstore/model/CreateTairInstanceRequest.h @@ -97,6 +97,8 @@ namespace AlibabaCloud void setSrcDBInstanceId(const std::string& srcDBInstanceId); std::string getOwnerAccount()const; void setOwnerAccount(const std::string& ownerAccount); + std::string getGlobalInstanceId()const; + void setGlobalInstanceId(const std::string& globalInstanceId); std::string getVpcId()const; void setVpcId(const std::string& vpcId); std::string getChargeType()const; @@ -134,6 +136,7 @@ namespace AlibabaCloud std::string resourceOwnerAccount_; std::string srcDBInstanceId_; std::string ownerAccount_; + std::string globalInstanceId_; std::string vpcId_; std::string chargeType_; diff --git a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceRequest.h b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceRequest.h index f709340dc..05f8330e7 100644 --- a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceRequest.h +++ b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceRequest.h @@ -51,6 +51,8 @@ namespace AlibabaCloud void setEngine(const std::string& engine); std::string getInstanceChargeType()const; void setInstanceChargeType(const std::string& instanceChargeType); + std::string getNodeId()const; + void setNodeId(const std::string& nodeId); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getLevel()const; @@ -77,6 +79,7 @@ namespace AlibabaCloud std::string regionId_; std::string engine_; std::string instanceChargeType_; + std::string nodeId_; std::string resourceOwnerAccount_; std::string level_; std::string ownerAccount_; diff --git a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceResult.h b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceResult.h index 1921fb0fa..24f1adf6e 100644 --- a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceResult.h +++ b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeAvailableResourceResult.h @@ -50,6 +50,7 @@ namespace AlibabaCloud { struct AvailableResource { + long capacity; std::string instanceClassRemark; std::string instanceClass; }; diff --git a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeEngineVersionResult.h b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeEngineVersionResult.h index 7e667f693..be6167f44 100644 --- a/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeEngineVersionResult.h +++ b/r-kvstore/include/alibabacloud/r-kvstore/model/DescribeEngineVersionResult.h @@ -40,9 +40,12 @@ namespace AlibabaCloud std::string getMajorVersion()const; bool getIsLatestVersion()const; std::string getMinorVersion()const; + std::string getProxyMinorVersion()const; std::string getEngine()const; bool getEnableUpgradeMinorVersion()const; + std::string getProxyVersionRelease()const; bool getEnableUpgradeMajorVersion()const; + std::string getDBVersionRelease()const; protected: void parse(const std::string &payload); @@ -50,9 +53,12 @@ namespace AlibabaCloud std::string majorVersion_; bool isLatestVersion_; std::string minorVersion_; + std::string proxyMinorVersion_; std::string engine_; bool enableUpgradeMinorVersion_; + std::string proxyVersionRelease_; bool enableUpgradeMajorVersion_; + std::string dBVersionRelease_; }; } diff --git a/r-kvstore/src/model/CreateTairInstanceRequest.cc b/r-kvstore/src/model/CreateTairInstanceRequest.cc index 9f5434330..765985bd8 100644 --- a/r-kvstore/src/model/CreateTairInstanceRequest.cc +++ b/r-kvstore/src/model/CreateTairInstanceRequest.cc @@ -368,6 +368,17 @@ void CreateTairInstanceRequest::setOwnerAccount(const std::string& ownerAccount) setParameter("OwnerAccount", ownerAccount); } +std::string CreateTairInstanceRequest::getGlobalInstanceId()const +{ + return globalInstanceId_; +} + +void CreateTairInstanceRequest::setGlobalInstanceId(const std::string& globalInstanceId) +{ + globalInstanceId_ = globalInstanceId; + setParameter("GlobalInstanceId", globalInstanceId); +} + std::string CreateTairInstanceRequest::getVpcId()const { return vpcId_; diff --git a/r-kvstore/src/model/DescribeAvailableResourceRequest.cc b/r-kvstore/src/model/DescribeAvailableResourceRequest.cc index 36dab73ee..90f0b9789 100644 --- a/r-kvstore/src/model/DescribeAvailableResourceRequest.cc +++ b/r-kvstore/src/model/DescribeAvailableResourceRequest.cc @@ -115,6 +115,17 @@ void DescribeAvailableResourceRequest::setInstanceChargeType(const std::string& setParameter("InstanceChargeType", instanceChargeType); } +std::string DescribeAvailableResourceRequest::getNodeId()const +{ + return nodeId_; +} + +void DescribeAvailableResourceRequest::setNodeId(const std::string& nodeId) +{ + nodeId_ = nodeId; + setParameter("NodeId", nodeId); +} + std::string DescribeAvailableResourceRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_; diff --git a/r-kvstore/src/model/DescribeAvailableResourceResult.cc b/r-kvstore/src/model/DescribeAvailableResourceResult.cc index 96af62a09..41ff86b08 100644 --- a/r-kvstore/src/model/DescribeAvailableResourceResult.cc +++ b/r-kvstore/src/model/DescribeAvailableResourceResult.cc @@ -103,6 +103,8 @@ void DescribeAvailableResourceResult::parse(const std::string &payload) availableResourcesObject.instanceClass = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEditionTypesSupportedEditionTypeSupportedSeriesTypesSupportedSeriesTypeSupportedEngineVersionsSupportedEngineVersionSupportedArchitectureTypesSupportedArchitectureTypeSupportedShardNumbersSupportedShardNumberSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClass"].asString(); if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEditionTypesSupportedEditionTypeSupportedSeriesTypesSupportedSeriesTypeSupportedEngineVersionsSupportedEngineVersionSupportedArchitectureTypesSupportedArchitectureTypeSupportedShardNumbersSupportedShardNumberSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClassRemark"].isNull()) availableResourcesObject.instanceClassRemark = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEditionTypesSupportedEditionTypeSupportedSeriesTypesSupportedSeriesTypeSupportedEngineVersionsSupportedEngineVersionSupportedArchitectureTypesSupportedArchitectureTypeSupportedShardNumbersSupportedShardNumberSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["InstanceClassRemark"].asString(); + if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEditionTypesSupportedEditionTypeSupportedSeriesTypesSupportedSeriesTypeSupportedEngineVersionsSupportedEngineVersionSupportedArchitectureTypesSupportedArchitectureTypeSupportedShardNumbersSupportedShardNumberSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["Capacity"].isNull()) + availableResourcesObject.capacity = std::stol(valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineSupportedEditionTypesSupportedEditionTypeSupportedSeriesTypesSupportedSeriesTypeSupportedEngineVersionsSupportedEngineVersionSupportedArchitectureTypesSupportedArchitectureTypeSupportedShardNumbersSupportedShardNumberSupportedNodeTypesSupportedNodeTypeAvailableResourcesAvailableResource["Capacity"].asString()); supportedNodeTypesObject.availableResources.push_back(availableResourcesObject); } supportedShardNumbersObject.supportedNodeTypes.push_back(supportedNodeTypesObject); diff --git a/r-kvstore/src/model/DescribeEngineVersionResult.cc b/r-kvstore/src/model/DescribeEngineVersionResult.cc index e2ea284ee..19d234a78 100644 --- a/r-kvstore/src/model/DescribeEngineVersionResult.cc +++ b/r-kvstore/src/model/DescribeEngineVersionResult.cc @@ -51,6 +51,12 @@ void DescribeEngineVersionResult::parse(const std::string &payload) majorVersion_ = value["MajorVersion"].asString(); if(!value["EnableUpgradeMajorVersion"].isNull()) enableUpgradeMajorVersion_ = value["EnableUpgradeMajorVersion"].asString() == "true"; + if(!value["ProxyMinorVersion"].isNull()) + proxyMinorVersion_ = value["ProxyMinorVersion"].asString(); + if(!value["DBVersionRelease"].isNull()) + dBVersionRelease_ = value["DBVersionRelease"].asString(); + if(!value["ProxyVersionRelease"].isNull()) + proxyVersionRelease_ = value["ProxyVersionRelease"].asString(); } @@ -69,6 +75,11 @@ std::string DescribeEngineVersionResult::getMinorVersion()const return minorVersion_; } +std::string DescribeEngineVersionResult::getProxyMinorVersion()const +{ + return proxyMinorVersion_; +} + std::string DescribeEngineVersionResult::getEngine()const { return engine_; @@ -79,8 +90,18 @@ bool DescribeEngineVersionResult::getEnableUpgradeMinorVersion()const return enableUpgradeMinorVersion_; } +std::string DescribeEngineVersionResult::getProxyVersionRelease()const +{ + return proxyVersionRelease_; +} + bool DescribeEngineVersionResult::getEnableUpgradeMajorVersion()const { return enableUpgradeMajorVersion_; } +std::string DescribeEngineVersionResult::getDBVersionRelease()const +{ + return dBVersionRelease_; +} +