diff --git a/CHANGELOG b/CHANGELOG index ed4901c25..d8f627e41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-01-25 Version: patch +- Regenerate SDK to override list implement. + 2021-01-25 Version: patch - Update Open API. diff --git a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h index e943271ee..b80861beb 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h @@ -143,6 +143,8 @@ namespace AlibabaCloud void setEnableVmOsConfig(bool enableVmOsConfig); std::vector getNetworkInterface()const; void setNetworkInterface(const std::vector& networkInterface); + std::string getDeploymentSetId()const; + void setDeploymentSetId(const std::string& deploymentSetId); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -205,6 +207,7 @@ namespace AlibabaCloud std::string instanceChargeType_; bool enableVmOsConfig_; std::vector networkInterface_; + std::string deploymentSetId_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string systemDiskDiskName_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h index acfbf17b3..14f77627d 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h @@ -136,6 +136,8 @@ namespace AlibabaCloud void setEnableVmOsConfig(bool enableVmOsConfig); std::vector getNetworkInterface()const; void setNetworkInterface(const std::vector& networkInterface); + std::string getDeploymentSetId()const; + void setDeploymentSetId(const std::string& deploymentSetId); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -197,6 +199,7 @@ namespace AlibabaCloud std::string instanceChargeType_; bool enableVmOsConfig_; std::vector networkInterface_; + std::string deploymentSetId_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string systemDiskDiskName_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostClustersResult.h b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostClustersResult.h index c405d45e7..3973302c7 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostClustersResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostClustersResult.h @@ -42,6 +42,12 @@ namespace AlibabaCloud int availableDisk; std::string dataDiskCategory; }; + struct AvailableInstanceType + { + int availableInstanceCapacity; + std::string instanceType; + }; + std::vector availableInstanceTypes; int totalMemory; int availableMemory; int availableVcpus; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h index 6b53485b0..b86f23cd5 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h @@ -59,6 +59,8 @@ namespace AlibabaCloud void setDedicatedHostType(const std::string& dedicatedHostType); std::vector getTag()const; void setTag(const std::vector& tag); + std::string getNeedHostDetail()const; + void setNeedHostDetail(const std::string& needHostDetail); std::string getDedicatedHostName()const; void setDedicatedHostName(const std::string& dedicatedHostName); std::string getResourceOwnerAccount()const; @@ -82,6 +84,7 @@ namespace AlibabaCloud int pageSize_; std::string dedicatedHostType_; std::vector tag_; + std::string needHostDetail_; std::string dedicatedHostName_; std::string resourceOwnerAccount_; std::string ownerAccount_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h index 2e2ad8c07..c7edd0874 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h @@ -51,6 +51,10 @@ namespace AlibabaCloud int udpTimeout; int slbUdpTimeout; }; + struct HostDetailInfo + { + std::string serialNumber; + }; struct Instance { std::string instanceId; @@ -79,6 +83,7 @@ namespace AlibabaCloud float cpuOverCommitRatio; std::string saleCycle; std::vector tags; + HostDetailInfo hostDetailInfo; std::string status; std::string zoneId; std::string autoPlacement; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h index a145c40cf..1044ddde3 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h @@ -94,6 +94,7 @@ namespace AlibabaCloud std::string systemDiskCategory; std::string internetChargeType; std::string instanceName; + std::string deploymentSetId; bool systemDiskDeleteWithInstance; int internetMaxBandwidthOut; bool enableVmOsConfig; diff --git a/ecs/include/alibabacloud/ecs/model/ModifyAutoProvisioningGroupRequest.h b/ecs/include/alibabacloud/ecs/model/ModifyAutoProvisioningGroupRequest.h index 8463a8b5d..6a71de7d4 100644 --- a/ecs/include/alibabacloud/ecs/model/ModifyAutoProvisioningGroupRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ModifyAutoProvisioningGroupRequest.h @@ -30,6 +30,15 @@ namespace AlibabaCloud { class ALIBABACLOUD_ECS_EXPORT ModifyAutoProvisioningGroupRequest : public RpcServiceRequest { + public: + struct LaunchTemplateConfig + { + std::string instanceType; + double maxPrice; + std::string vSwitchId; + double weightedCapacity; + int priority; + }; public: ModifyAutoProvisioningGroupRequest(); @@ -45,6 +54,8 @@ namespace AlibabaCloud void setDefaultTargetCapacityType(const std::string& defaultTargetCapacityType); std::string getExcessCapacityTerminationPolicy()const; void setExcessCapacityTerminationPolicy(const std::string& excessCapacityTerminationPolicy); + std::vector getLaunchTemplateConfig()const; + void setLaunchTemplateConfig(const std::vector& launchTemplateConfig); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -70,6 +81,7 @@ namespace AlibabaCloud std::string regionId_; std::string defaultTargetCapacityType_; std::string excessCapacityTerminationPolicy_; + std::vector launchTemplateConfig_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/src/model/CreateLaunchTemplateRequest.cc b/ecs/src/model/CreateLaunchTemplateRequest.cc index 46b3ca76e..4130e026b 100644 --- a/ecs/src/model/CreateLaunchTemplateRequest.cc +++ b/ecs/src/model/CreateLaunchTemplateRequest.cc @@ -466,6 +466,17 @@ void CreateLaunchTemplateRequest::setNetworkInterface(const std::vector& tag) } } +std::string DescribeDedicatedHostsRequest::getNeedHostDetail()const +{ + return needHostDetail_; +} + +void DescribeDedicatedHostsRequest::setNeedHostDetail(const std::string& needHostDetail) +{ + needHostDetail_ = needHostDetail; + setParameter("NeedHostDetail", needHostDetail); +} + std::string DescribeDedicatedHostsRequest::getDedicatedHostName()const { return dedicatedHostName_; diff --git a/ecs/src/model/DescribeDedicatedHostsResult.cc b/ecs/src/model/DescribeDedicatedHostsResult.cc index caf88e10c..d506d6cb9 100644 --- a/ecs/src/model/DescribeDedicatedHostsResult.cc +++ b/ecs/src/model/DescribeDedicatedHostsResult.cc @@ -139,6 +139,9 @@ void DescribeDedicatedHostsResult::parse(const std::string &payload) dedicatedHostsObject.networkAttributes.slbUdpTimeout = std::stoi(networkAttributesNode["SlbUdpTimeout"].asString()); if(!networkAttributesNode["UdpTimeout"].isNull()) dedicatedHostsObject.networkAttributes.udpTimeout = std::stoi(networkAttributesNode["UdpTimeout"].asString()); + auto hostDetailInfoNode = value["HostDetailInfo"]; + if(!hostDetailInfoNode["SerialNumber"].isNull()) + dedicatedHostsObject.hostDetailInfo.serialNumber = hostDetailInfoNode["SerialNumber"].asString(); auto allSupportedInstanceTypeFamilies = value["SupportedInstanceTypeFamilies"]["SupportedInstanceTypeFamily"]; for (auto value : allSupportedInstanceTypeFamilies) dedicatedHostsObject.supportedInstanceTypeFamilies.push_back(value.asString()); diff --git a/ecs/src/model/DescribeLaunchTemplateVersionsResult.cc b/ecs/src/model/DescribeLaunchTemplateVersionsResult.cc index a75c99a4d..716c5610c 100644 --- a/ecs/src/model/DescribeLaunchTemplateVersionsResult.cc +++ b/ecs/src/model/DescribeLaunchTemplateVersionsResult.cc @@ -132,6 +132,8 @@ void DescribeLaunchTemplateVersionsResult::parse(const std::string &payload) launchTemplateVersionSetsObject.launchTemplateData.securityEnhancementStrategy = launchTemplateDataNode["SecurityEnhancementStrategy"].asString(); if(!launchTemplateDataNode["PrivateIpAddress"].isNull()) launchTemplateVersionSetsObject.launchTemplateData.privateIpAddress = launchTemplateDataNode["PrivateIpAddress"].asString(); + if(!launchTemplateDataNode["DeploymentSetId"].isNull()) + launchTemplateVersionSetsObject.launchTemplateData.deploymentSetId = launchTemplateDataNode["DeploymentSetId"].asString(); auto allDataDisksNode = launchTemplateDataNode["DataDisks"]["DataDisk"]; for (auto launchTemplateDataNodeDataDisksDataDisk : allDataDisksNode) { diff --git a/ecs/src/model/ModifyAutoProvisioningGroupRequest.cc b/ecs/src/model/ModifyAutoProvisioningGroupRequest.cc index f9a5b9586..2b4754160 100644 --- a/ecs/src/model/ModifyAutoProvisioningGroupRequest.cc +++ b/ecs/src/model/ModifyAutoProvisioningGroupRequest.cc @@ -82,6 +82,25 @@ void ModifyAutoProvisioningGroupRequest::setExcessCapacityTerminationPolicy(cons setParameter("ExcessCapacityTerminationPolicy", excessCapacityTerminationPolicy); } +std::vector ModifyAutoProvisioningGroupRequest::getLaunchTemplateConfig()const +{ + return launchTemplateConfig_; +} + +void ModifyAutoProvisioningGroupRequest::setLaunchTemplateConfig(const std::vector& launchTemplateConfig) +{ + launchTemplateConfig_ = launchTemplateConfig; + for(int dep1 = 0; dep1!= launchTemplateConfig.size(); dep1++) { + auto launchTemplateConfigObj = launchTemplateConfig.at(dep1); + std::string launchTemplateConfigObjStr = "LaunchTemplateConfig." + std::to_string(dep1 + 1); + setParameter(launchTemplateConfigObjStr + ".InstanceType", launchTemplateConfigObj.instanceType); + setParameter(launchTemplateConfigObjStr + ".MaxPrice", std::to_string(launchTemplateConfigObj.maxPrice)); + setParameter(launchTemplateConfigObjStr + ".VSwitchId", launchTemplateConfigObj.vSwitchId); + setParameter(launchTemplateConfigObjStr + ".WeightedCapacity", std::to_string(launchTemplateConfigObj.weightedCapacity)); + setParameter(launchTemplateConfigObjStr + ".Priority", std::to_string(launchTemplateConfigObj.priority)); + } +} + std::string ModifyAutoProvisioningGroupRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_;