diff --git a/CHANGELOG b/CHANGELOG index e99b1d2f5..ad6bb55f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2022-07-11 Version: 1.36.1176 +- Support Storage And Network Features For LaunchTemplate. + 2022-07-11 Version: 1.36.1175 - Add new api for rule. diff --git a/VERSION b/VERSION index f48bfeb9c..b199a6707 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1175 \ No newline at end of file +1.36.1176 \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/AllocateDedicatedHostsRequest.h b/ecs/include/alibabacloud/ecs/model/AllocateDedicatedHostsRequest.h index 096b4340a..a3fa78b11 100644 --- a/ecs/include/alibabacloud/ecs/model/AllocateDedicatedHostsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/AllocateDedicatedHostsRequest.h @@ -72,6 +72,8 @@ public: void setAutoReleaseTime(const std::string &autoReleaseTime); long getOwnerId() const; void setOwnerId(long ownerId); + std::string getSchedulerOptionsFenceId() const; + void setSchedulerOptionsFenceId(const std::string &schedulerOptionsFenceId); std::string getPeriodUnit() const; void setPeriodUnit(const std::string &periodUnit); bool getAutoRenew() const; @@ -107,6 +109,7 @@ private: std::string ownerAccount_; std::string autoReleaseTime_; long ownerId_; + std::string schedulerOptionsFenceId_; std::string periodUnit_; bool autoRenew_; int networkAttributesSlbUdpTimeout_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateCommandRequest.h b/ecs/include/alibabacloud/ecs/model/CreateCommandRequest.h index 9194d2173..c919b12c0 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateCommandRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateCommandRequest.h @@ -44,6 +44,8 @@ public: void setTimeout(long timeout); std::string getRegionId() const; void setRegionId(const std::string ®ionId); + std::string getContentEncoding() const; + void setContentEncoding(const std::string &contentEncoding); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -63,6 +65,7 @@ private: std::string commandContent_; long timeout_; std::string regionId_; + std::string contentEncoding_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h index 0db7324f5..cd9f08e3c 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h @@ -42,6 +42,8 @@ public: std::string description; std::string securityGroupId; std::string primaryIpAddress; + std::string instanceType; + std::string networkInterfaceTrafficMode; }; struct DataDisk { std::string performanceLevel; @@ -53,6 +55,9 @@ public: std::string category; bool deleteWithInstance; std::string encrypted; + std::string autoSnapshotPolicyId; + long provisionedIops; + bool burstingEnabled; }; CreateLaunchTemplateRequest(); ~CreateLaunchTemplateRequest(); @@ -80,6 +85,8 @@ public: void setTemplateTag(const std::vector &templateTag); std::vector getTag() const; void setTag(const std::vector &tag); + std::string getSystemDiskAutoSnapshotPolicyId() const; + void setSystemDiskAutoSnapshotPolicyId(const std::string &systemDiskAutoSnapshotPolicyId); int getPeriod() const; void setPeriod(int period); int getIpv6AddressCount() const; @@ -94,6 +101,8 @@ public: void setSpotStrategy(const std::string &spotStrategy); std::string getPrivateIpAddress() const; void setPrivateIpAddress(const std::string &privateIpAddress); + bool getSystemDiskBurstingEnabled() const; + void setSystemDiskBurstingEnabled(bool systemDiskBurstingEnabled); std::string getInstanceName() const; void setInstanceName(const std::string &instanceName); std::string getInternetChargeType() const; @@ -152,6 +161,8 @@ public: void setSecurityGroupIds(const std::vector &securityGroupIds); std::vector getDataDisk() const; void setDataDisk(const std::vector &dataDisk); + long getSystemDiskProvisionedIops() const; + void setSystemDiskProvisionedIops(long systemDiskProvisionedIops); int getSystemDiskSize() const; void setSystemDiskSize(int systemDiskSize); std::string getVpcId() const; @@ -172,6 +183,7 @@ private: int systemDiskIops_; std::vector templateTag_; std::vector tag_; + std::string systemDiskAutoSnapshotPolicyId_; int period_; int ipv6AddressCount_; std::string templateResourceGroupId_; @@ -179,6 +191,7 @@ private: std::string vSwitchId_; std::string spotStrategy_; std::string privateIpAddress_; + bool systemDiskBurstingEnabled_; std::string instanceName_; std::string internetChargeType_; std::string zoneId_; @@ -208,6 +221,7 @@ private: int spotDuration_; std::vector securityGroupIds_; std::vector dataDisk_; + long systemDiskProvisionedIops_; int systemDiskSize_; std::string vpcId_; std::string systemDiskDescription_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h index c54d21fbf..6db4dbef2 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateVersionRequest.h @@ -38,6 +38,8 @@ public: std::string description; std::string securityGroupId; std::string primaryIpAddress; + std::string instanceType; + std::string networkInterfaceTrafficMode; }; struct DataDisk { std::string performanceLevel; @@ -49,6 +51,9 @@ public: std::string category; bool deleteWithInstance; std::string encrypted; + long provisionedIops; + bool burstingEnabled; + std::string autoSnapshotPolicyId; }; CreateLaunchTemplateVersionRequest(); ~CreateLaunchTemplateVersionRequest(); @@ -74,6 +79,8 @@ public: void setSystemDiskIops(int systemDiskIops); std::vector getTag() const; void setTag(const std::vector &tag); + std::string getSystemDiskAutoSnapshotPolicyId() const; + void setSystemDiskAutoSnapshotPolicyId(const std::string &systemDiskAutoSnapshotPolicyId); int getPeriod() const; void setPeriod(int period); std::string getLaunchTemplateId() const; @@ -88,6 +95,8 @@ public: void setSpotStrategy(const std::string &spotStrategy); std::string getPrivateIpAddress() const; void setPrivateIpAddress(const std::string &privateIpAddress); + bool getSystemDiskBurstingEnabled() const; + void setSystemDiskBurstingEnabled(bool systemDiskBurstingEnabled); std::string getInstanceName() const; void setInstanceName(const std::string &instanceName); std::string getInternetChargeType() const; @@ -146,6 +155,8 @@ public: void setSecurityGroupIds(const std::vector &securityGroupIds); std::vector getDataDisk() const; void setDataDisk(const std::vector &dataDisk); + long getSystemDiskProvisionedIops() const; + void setSystemDiskProvisionedIops(long systemDiskProvisionedIops); int getSystemDiskSize() const; void setSystemDiskSize(int systemDiskSize); std::string getVpcId() const; @@ -165,6 +176,7 @@ private: std::string hostName_; int systemDiskIops_; std::vector tag_; + std::string systemDiskAutoSnapshotPolicyId_; int period_; std::string launchTemplateId_; int ipv6AddressCount_; @@ -172,6 +184,7 @@ private: std::string vSwitchId_; std::string spotStrategy_; std::string privateIpAddress_; + bool systemDiskBurstingEnabled_; std::string instanceName_; std::string internetChargeType_; std::string zoneId_; @@ -201,6 +214,7 @@ private: int spotDuration_; std::vector securityGroupIds_; std::vector dataDisk_; + long systemDiskProvisionedIops_; int systemDiskSize_; std::string vpcId_; std::string systemDiskDescription_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h index 3869cf97c..04a082d27 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h @@ -48,6 +48,8 @@ public: void setContentEncoding(const std::string &contentEncoding); long getPageSize() const; void setPageSize(long pageSize); + bool getLatest() const; + void setLatest(bool latest); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -67,6 +69,7 @@ private: std::string provider_; std::string contentEncoding_; long pageSize_; + bool latest_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h index f89e00685..6a2e5c676 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h @@ -34,6 +34,15 @@ namespace AlibabaCloud public: struct Command { + struct ParameterDefinition + { + std::string defaultValue; + std::string description; + bool required; + std::string parameterName; + std::vector possibleValues; + }; + std::vector parameterDefinitions; std::string description; std::string category; std::vector parameterNames; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h index 1e209ae5e..67f85e0a6 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h @@ -34,6 +34,22 @@ namespace AlibabaCloud public: struct Image { + struct DetectionOptions + { + struct Item + { + std::string riskCode; + std::string value; + std::string riskLevel; + std::string name; + }; + std::string status; + std::vector items; + }; + struct Features + { + std::string nvmeSupport; + }; struct DiskDeviceMapping { std::string snapshotId; @@ -61,6 +77,8 @@ namespace AlibabaCloud std::string oSName; bool isPublic; std::string imageId; + DetectionOptions detectionOptions; + Features features; std::vector tags; std::string oSNameEn; bool loginAsNonRootSupported; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h index c9f589f9c..27498966a 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h @@ -55,8 +55,11 @@ namespace AlibabaCloud std::string invocationStatus; std::string parameters; bool timed; + std::string commandDescription; + long timeout; std::vector invokeInstances; std::string commandContent; + std::string workingDir; std::string repeatMode; std::string invokeStatus; std::string commandType; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h index 2339c71f8..29b9f16bb 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsResult.h @@ -39,6 +39,7 @@ namespace AlibabaCloud struct DataDisk { std::string snapshotId; + bool burstingEnabled; std::string description; std::string category; std::string performanceLevel; @@ -46,16 +47,20 @@ namespace AlibabaCloud int size; std::string encrypted; bool deleteWithInstance; + std::string autoSnapshotPolicyId; std::string diskName; + long provisionedIops; }; struct NetworkInterface { + std::string networkInterfaceTrafficMode; std::string description; std::vector securityGroupIds1; std::string vSwitchId; std::string securityGroupId; std::string networkInterfaceName; std::string primaryIpAddress; + std::string instanceType; }; struct InstanceTag { @@ -71,7 +76,9 @@ namespace AlibabaCloud int systemDiskSize; std::string systemDiskDescription; std::string instanceChargeType; + long systemDiskProvisionedIops; int spotDuration; + std::string systemDiskAutoSnapshotPolicyId; std::string ramRoleName; std::string systemDiskPerformanceLevel; std::string networkType; @@ -96,6 +103,7 @@ namespace AlibabaCloud std::string internetChargeType; std::string deploymentSetId; std::string instanceName; + bool systemDiskBurstingEnabled; bool systemDiskDeleteWithInstance; bool enableVmOsConfig; int internetMaxBandwidthOut; diff --git a/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h b/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h index fe26f5734..0b19646c6 100644 --- a/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ImportImageRequest.h @@ -64,6 +64,8 @@ public: void setArchitecture(const std::string &architecture); std::string getLicenseType() const; void setLicenseType(const std::string &licenseType); + std::string getDetectionStrategy() const; + void setDetectionStrategy(const std::string &detectionStrategy); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getRoleName() const; @@ -85,6 +87,7 @@ private: std::vector tag_; std::string architecture_; std::string licenseType_; + std::string detectionStrategy_; std::string resourceOwnerAccount_; std::string roleName_; std::string oSType_; diff --git a/ecs/include/alibabacloud/ecs/model/ModifyImageAttributeRequest.h b/ecs/include/alibabacloud/ecs/model/ModifyImageAttributeRequest.h index 01cb346b8..41887568f 100644 --- a/ecs/include/alibabacloud/ecs/model/ModifyImageAttributeRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ModifyImageAttributeRequest.h @@ -28,6 +28,9 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT ModifyImageAttributeRequest : public RpcServiceRequest { public: + struct Features { + std::string nvmeSupport; + }; ModifyImageAttributeRequest(); ~ModifyImageAttributeRequest(); long getResourceOwnerId() const; @@ -36,6 +39,8 @@ public: void setImageId(const std::string &imageId); std::string getDescription() const; void setDescription(const std::string &description); + Features getFeatures() const; + void setFeatures(const Features &features); std::string getBootMode() const; void setBootMode(const std::string &bootMode); std::string getRegionId() const; @@ -59,6 +64,7 @@ private: long resourceOwnerId_; std::string imageId_; std::string description_; + Features features_; std::string bootMode_; std::string regionId_; std::string imageName_; diff --git a/ecs/src/model/AllocateDedicatedHostsRequest.cc b/ecs/src/model/AllocateDedicatedHostsRequest.cc index fd2a14f00..30ddfa13e 100644 --- a/ecs/src/model/AllocateDedicatedHostsRequest.cc +++ b/ecs/src/model/AllocateDedicatedHostsRequest.cc @@ -201,6 +201,15 @@ void AllocateDedicatedHostsRequest::setOwnerId(long ownerId) { setParameter(std::string("OwnerId"), std::to_string(ownerId)); } +std::string AllocateDedicatedHostsRequest::getSchedulerOptionsFenceId() const { + return schedulerOptionsFenceId_; +} + +void AllocateDedicatedHostsRequest::setSchedulerOptionsFenceId(const std::string &schedulerOptionsFenceId) { + schedulerOptionsFenceId_ = schedulerOptionsFenceId; + setParameter(std::string("SchedulerOptions.FenceId"), schedulerOptionsFenceId); +} + std::string AllocateDedicatedHostsRequest::getPeriodUnit() const { return periodUnit_; } diff --git a/ecs/src/model/CreateCommandRequest.cc b/ecs/src/model/CreateCommandRequest.cc index dbd3f4c19..1161b130a 100644 --- a/ecs/src/model/CreateCommandRequest.cc +++ b/ecs/src/model/CreateCommandRequest.cc @@ -88,6 +88,15 @@ void CreateCommandRequest::setRegionId(const std::string ®ionId) { setParameter(std::string("RegionId"), regionId); } +std::string CreateCommandRequest::getContentEncoding() const { + return contentEncoding_; +} + +void CreateCommandRequest::setContentEncoding(const std::string &contentEncoding) { + contentEncoding_ = contentEncoding; + setParameter(std::string("ContentEncoding"), contentEncoding); +} + std::string CreateCommandRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/CreateLaunchTemplateRequest.cc b/ecs/src/model/CreateLaunchTemplateRequest.cc index 84d0141fd..597261ebd 100644 --- a/ecs/src/model/CreateLaunchTemplateRequest.cc +++ b/ecs/src/model/CreateLaunchTemplateRequest.cc @@ -143,6 +143,15 @@ void CreateLaunchTemplateRequest::setTag(const std::vector