diff --git a/CHANGELOG b/CHANGELOG index 91f72275a..dd0f76508 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-04-17 Version: 1.36.363 +- DescribeInstanceTypes support TotalEniQueueQuantity. + 2020-04-16 Version: 1.36.362 - Modify `SubmitSmarttagJob`. diff --git a/VERSION b/VERSION index 7323a1527..0de6be569 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.362 \ No newline at end of file +1.36.363 \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h index 2c6fad61e..814d9406d 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h @@ -39,6 +39,7 @@ namespace AlibabaCloud int eniIpv6AddressQuantity; int cpuCoreCount; long localStorageCapacity; + int totalEniQueueQuantity; std::string instanceTypeFamily; long instancePpsRx; int initialCredit; diff --git a/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h b/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h index a9828d7bc..91e45ee7b 100644 --- a/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h @@ -40,6 +40,11 @@ namespace AlibabaCloud std::string oSSObject; int diskImageSize; }; + struct Tag + { + std::string value; + std::string key; + }; public: ImportImageRequest(); @@ -53,10 +58,14 @@ namespace AlibabaCloud void setDescription(const std::string& description); std::string getPlatform()const; void setPlatform(const std::string& platform); + std::string getResourceGroupId()const; + void setResourceGroupId(const std::string& resourceGroupId); std::string getRegionId()const; void setRegionId(const std::string& regionId); std::string getImageName()const; void setImageName(const std::string& imageName); + std::vector getTag()const; + void setTag(const std::vector& tag); std::string getArchitecture()const; void setArchitecture(const std::string& architecture); std::string getLicenseType()const; @@ -75,8 +84,10 @@ namespace AlibabaCloud long resourceOwnerId_; std::string description_; std::string platform_; + std::string resourceGroupId_; std::string regionId_; std::string imageName_; + std::vector tag_; std::string architecture_; std::string licenseType_; std::string resourceOwnerAccount_; diff --git a/ecs/src/model/DescribeInstanceTypesResult.cc b/ecs/src/model/DescribeInstanceTypesResult.cc index cabf16c63..637c5e7e6 100644 --- a/ecs/src/model/DescribeInstanceTypesResult.cc +++ b/ecs/src/model/DescribeInstanceTypesResult.cc @@ -81,6 +81,8 @@ void DescribeInstanceTypesResult::parse(const std::string &payload) instanceTypesObject.instancePpsTx = std::stol(valueInstanceTypesInstanceType["InstancePpsTx"].asString()); if(!valueInstanceTypesInstanceType["InstanceFamilyLevel"].isNull()) instanceTypesObject.instanceFamilyLevel = valueInstanceTypesInstanceType["InstanceFamilyLevel"].asString(); + if(!valueInstanceTypesInstanceType["TotalEniQueueQuantity"].isNull()) + instanceTypesObject.totalEniQueueQuantity = std::stoi(valueInstanceTypesInstanceType["TotalEniQueueQuantity"].asString()); instanceTypes_.push_back(instanceTypesObject); } diff --git a/ecs/src/model/ImportImageRequest.cc b/ecs/src/model/ImportImageRequest.cc index ed99546b4..640758dda 100644 --- a/ecs/src/model/ImportImageRequest.cc +++ b/ecs/src/model/ImportImageRequest.cc @@ -80,6 +80,17 @@ void ImportImageRequest::setPlatform(const std::string& platform) setParameter("Platform", platform); } +std::string ImportImageRequest::getResourceGroupId()const +{ + return resourceGroupId_; +} + +void ImportImageRequest::setResourceGroupId(const std::string& resourceGroupId) +{ + resourceGroupId_ = resourceGroupId; + setParameter("ResourceGroupId", resourceGroupId); +} + std::string ImportImageRequest::getRegionId()const { return regionId_; @@ -102,6 +113,22 @@ void ImportImageRequest::setImageName(const std::string& imageName) setParameter("ImageName", imageName); } +std::vector ImportImageRequest::getTag()const +{ + return tag_; +} + +void ImportImageRequest::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 + 1); + setParameter(tagObjStr + ".Value", tagObj.value); + setParameter(tagObjStr + ".Key", tagObj.key); + } +} + std::string ImportImageRequest::getArchitecture()const { return architecture_;