Просмотр исходного кода

Regenerate SDK to override list implement.

sdk-team 5 лет назад
Родитель
Сommit
198969d4d9

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-01-25 Version: patch
+- Regenerate SDK to override list implement.
+
 2021-01-25 Version: patch
 - Update Open API.
 

+ 3 - 0
ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h

@@ -143,6 +143,8 @@ namespace AlibabaCloud
 				void setEnableVmOsConfig(bool enableVmOsConfig);
 				std::vector<NetworkInterface> getNetworkInterface()const;
 				void setNetworkInterface(const std::vector<NetworkInterface>& 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> networkInterface_;
+				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string systemDiskDiskName_;

+ 3 - 0
ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h

@@ -136,6 +136,8 @@ namespace AlibabaCloud
 				void setEnableVmOsConfig(bool enableVmOsConfig);
 				std::vector<NetworkInterface> getNetworkInterface()const;
 				void setNetworkInterface(const std::vector<NetworkInterface>& 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> networkInterface_;
+				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string systemDiskDiskName_;

+ 6 - 0
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<AvailableInstanceType> availableInstanceTypes;
 						int totalMemory;
 						int availableMemory;
 						int availableVcpus;

+ 3 - 0
ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h

@@ -59,6 +59,8 @@ namespace AlibabaCloud
 				void setDedicatedHostType(const std::string& dedicatedHostType);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& 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> tag_;
+				std::string needHostDetail_;
 				std::string dedicatedHostName_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;

+ 5 - 0
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<DedicatedHost::Tag> tags;
+					HostDetailInfo hostDetailInfo;
 					std::string status;
 					std::string zoneId;
 					std::string autoPlacement;

+ 1 - 0
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;

+ 12 - 0
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<LaunchTemplateConfig> getLaunchTemplateConfig()const;
+				void setLaunchTemplateConfig(const std::vector<LaunchTemplateConfig>& 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> launchTemplateConfig_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;

+ 11 - 0
ecs/src/model/CreateLaunchTemplateRequest.cc

@@ -466,6 +466,17 @@ void CreateLaunchTemplateRequest::setNetworkInterface(const std::vector<NetworkI
 	}
 }
 
+std::string CreateLaunchTemplateRequest::getDeploymentSetId()const
+{
+	return deploymentSetId_;
+}
+
+void CreateLaunchTemplateRequest::setDeploymentSetId(const std::string& deploymentSetId)
+{
+	deploymentSetId_ = deploymentSetId;
+	setParameter("DeploymentSetId", deploymentSetId);
+}
+
 std::string CreateLaunchTemplateRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

+ 11 - 0
ecs/src/model/CreateLaunchTemplateVersionRequest.cc

@@ -450,6 +450,17 @@ void CreateLaunchTemplateVersionRequest::setNetworkInterface(const std::vector<N
 	}
 }
 
+std::string CreateLaunchTemplateVersionRequest::getDeploymentSetId()const
+{
+	return deploymentSetId_;
+}
+
+void CreateLaunchTemplateVersionRequest::setDeploymentSetId(const std::string& deploymentSetId)
+{
+	deploymentSetId_ = deploymentSetId;
+	setParameter("DeploymentSetId", deploymentSetId);
+}
+
 std::string CreateLaunchTemplateVersionRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

+ 10 - 0
ecs/src/model/DescribeDedicatedHostClustersResult.cc

@@ -86,6 +86,16 @@ void DescribeDedicatedHostClustersResult::parse(const std::string &payload)
 				localStorageCapacityObject.dataDiskCategory = dedicatedHostClusterCapacityNodeLocalStorageCapacitiesLocalStorageCapacity["DataDiskCategory"].asString();
 			dedicatedHostClustersObject.dedicatedHostClusterCapacity.localStorageCapacities.push_back(localStorageCapacityObject);
 		}
+		auto allAvailableInstanceTypesNode = dedicatedHostClusterCapacityNode["AvailableInstanceTypes"]["AvailableInstanceType"];
+		for (auto dedicatedHostClusterCapacityNodeAvailableInstanceTypesAvailableInstanceType : allAvailableInstanceTypesNode)
+		{
+			DedicatedHostCluster::DedicatedHostClusterCapacity::AvailableInstanceType availableInstanceTypeObject;
+			if(!dedicatedHostClusterCapacityNodeAvailableInstanceTypesAvailableInstanceType["InstanceType"].isNull())
+				availableInstanceTypeObject.instanceType = dedicatedHostClusterCapacityNodeAvailableInstanceTypesAvailableInstanceType["InstanceType"].asString();
+			if(!dedicatedHostClusterCapacityNodeAvailableInstanceTypesAvailableInstanceType["AvailableInstanceCapacity"].isNull())
+				availableInstanceTypeObject.availableInstanceCapacity = std::stoi(dedicatedHostClusterCapacityNodeAvailableInstanceTypesAvailableInstanceType["AvailableInstanceCapacity"].asString());
+			dedicatedHostClustersObject.dedicatedHostClusterCapacity.availableInstanceTypes.push_back(availableInstanceTypeObject);
+		}
 		auto allDedicatedHostIds = value["DedicatedHostIds"]["DedicatedHostId"];
 		for (auto value : allDedicatedHostIds)
 			dedicatedHostClustersObject.dedicatedHostIds.push_back(value.asString());

+ 11 - 0
ecs/src/model/DescribeDedicatedHostsRequest.cc

@@ -131,6 +131,17 @@ void DescribeDedicatedHostsRequest::setTag(const std::vector<Tag>& 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_;

+ 3 - 0
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());

+ 2 - 0
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)
 		{

+ 19 - 0
ecs/src/model/ModifyAutoProvisioningGroupRequest.cc

@@ -82,6 +82,25 @@ void ModifyAutoProvisioningGroupRequest::setExcessCapacityTerminationPolicy(cons
 	setParameter("ExcessCapacityTerminationPolicy", excessCapacityTerminationPolicy);
 }
 
+std::vector<ModifyAutoProvisioningGroupRequest::LaunchTemplateConfig> ModifyAutoProvisioningGroupRequest::getLaunchTemplateConfig()const
+{
+	return launchTemplateConfig_;
+}
+
+void ModifyAutoProvisioningGroupRequest::setLaunchTemplateConfig(const std::vector<LaunchTemplateConfig>& 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_;