瀏覽代碼

ECS SDK Auto Released By zemin.lzm,Version:1.23.4

Signed-off-by: yixiong.jxy <yixiong.jxy@alibaba-inc.com>
yixiong.jxy 7 年之前
父節點
當前提交
3ff55b84c6

+ 3 - 0
ChangeLog.txt

@@ -1,3 +1,6 @@
+2018-08-01 Version: 1.23.4
+1, Support describePrice for market image, add return detailInfo in interface describePrice
+
 2018-07-26 Version: 1.23.3
 1, Add RemoveTerminals API.
 

+ 2 - 0
services/ecs/describe_available_resource.go

@@ -77,8 +77,10 @@ func (client *Client) DescribeAvailableResourceWithCallback(request *DescribeAva
 type DescribeAvailableResourceRequest struct {
 	*requests.RpcRequest
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
+	Memory               requests.Integer `position:"Query" name:"Memory"`
 	IoOptimized          string           `position:"Query" name:"IoOptimized"`
 	DataDiskCategory     string           `position:"Query" name:"DataDiskCategory"`
+	Cores                requests.Integer `position:"Query" name:"Cores"`
 	SystemDiskCategory   string           `position:"Query" name:"SystemDiskCategory"`
 	InstanceType         string           `position:"Query" name:"InstanceType"`
 	NetworkCategory      string           `position:"Query" name:"NetworkCategory"`

+ 6 - 0
services/ecs/describe_instance_auto_renew_attribute.go

@@ -80,13 +80,19 @@ type DescribeInstanceAutoRenewAttributeRequest struct {
 	InstanceId           string           `position:"Query" name:"InstanceId"`
 	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
 	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
+	RenewalStatus        string           `position:"Query" name:"RenewalStatus"`
+	PageSize             string           `position:"Query" name:"PageSize"`
 	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
+	PageNumber           string           `position:"Query" name:"PageNumber"`
 }
 
 // DescribeInstanceAutoRenewAttributeResponse is the response struct for api DescribeInstanceAutoRenewAttribute
 type DescribeInstanceAutoRenewAttributeResponse struct {
 	*responses.BaseResponse
 	RequestId               string                  `json:"RequestId" xml:"RequestId"`
+	PageNumber              int                     `json:"PageNumber" xml:"PageNumber"`
+	PageSize                int                     `json:"PageSize" xml:"PageSize"`
+	TotalCount              int                     `json:"TotalCount" xml:"TotalCount"`
 	InstanceRenewAttributes InstanceRenewAttributes `json:"InstanceRenewAttributes" xml:"InstanceRenewAttributes"`
 }
 

+ 2 - 0
services/ecs/describe_resources_modification.go

@@ -77,6 +77,8 @@ func (client *Client) DescribeResourcesModificationWithCallback(request *Describ
 type DescribeResourcesModificationRequest struct {
 	*requests.RpcRequest
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
+	Memory               requests.Integer `position:"Query" name:"Memory"`
+	Cores                requests.Integer `position:"Query" name:"Cores"`
 	MigrateAcrossZone    requests.Boolean `position:"Query" name:"MigrateAcrossZone"`
 	InstanceType         string           `position:"Query" name:"InstanceType"`
 	ResourceId           string           `position:"Query" name:"ResourceId"`

+ 1 - 0
services/ecs/describe_snapshots.go

@@ -87,6 +87,7 @@ type DescribeSnapshotsRequest struct {
 	Tag3Key              string           `position:"Query" name:"Tag.3.Key"`
 	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
 	Tag1Value            string           `position:"Query" name:"Tag.1.Value"`
+	ResourceGroupId      string           `position:"Query" name:"ResourceGroupId"`
 	Filter1Key           string           `position:"Query" name:"Filter.1.Key"`
 	PageSize             requests.Integer `position:"Query" name:"PageSize"`
 	DiskId               string           `position:"Query" name:"DiskId"`

+ 1 - 0
services/ecs/run_instances.go

@@ -78,6 +78,7 @@ type RunInstancesRequest struct {
 	*requests.RpcRequest
 	LaunchTemplateName          string                          `position:"Query" name:"LaunchTemplateName"`
 	ResourceOwnerId             requests.Integer                `position:"Query" name:"ResourceOwnerId"`
+	UniqueSuffix                requests.Boolean                `position:"Query" name:"UniqueSuffix"`
 	HpcClusterId                string                          `position:"Query" name:"HpcClusterId"`
 	SecurityEnhancementStrategy string                          `position:"Query" name:"SecurityEnhancementStrategy"`
 	KeyPairName                 string                          `position:"Query" name:"KeyPairName"`

+ 21 - 0
services/ecs/struct_detail_infos_in_describe_price.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// DetailInfosInDescribePrice is a nested struct in ecs response
+type DetailInfosInDescribePrice struct {
+	ResourcePriceModel []ResourcePriceModel `json:"ResourcePriceModel" xml:"ResourcePriceModel"`
+}

+ 21 - 0
services/ecs/struct_detail_infos_in_describe_renewal_price.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// DetailInfosInDescribeRenewalPrice is a nested struct in ecs response
+type DetailInfosInDescribeRenewalPrice struct {
+	ResourcePriceModel []ResourcePriceModel `json:"ResourcePriceModel" xml:"ResourcePriceModel"`
+}

+ 1 - 0
services/ecs/struct_image.go

@@ -37,6 +37,7 @@ type Image struct {
 	Platform             string               `json:"Platform" xml:"Platform"`
 	Usage                string               `json:"Usage" xml:"Usage"`
 	IsCopied             bool                 `json:"IsCopied" xml:"IsCopied"`
+	ResourceGroupId      string               `json:"ResourceGroupId" xml:"ResourceGroupId"`
 	DiskDeviceMappings   DiskDeviceMappings   `json:"DiskDeviceMappings" xml:"DiskDeviceMappings"`
 	Tags                 TagsInDescribeImages `json:"Tags" xml:"Tags"`
 }

+ 1 - 0
services/ecs/struct_instance_type.go

@@ -34,6 +34,7 @@ type InstanceType struct {
 	InitialCredit        int     `json:"InitialCredit" xml:"InitialCredit"`
 	InstancePpsTx        int     `json:"InstancePpsTx" xml:"InstancePpsTx"`
 	LocalStorageAmount   int     `json:"LocalStorageAmount" xml:"LocalStorageAmount"`
+	InstanceFamilyLevel  string  `json:"InstanceFamilyLevel" xml:"InstanceFamilyLevel"`
 	LocalStorageCapacity int     `json:"LocalStorageCapacity" xml:"LocalStorageCapacity"`
 	GPUSpec              string  `json:"GPUSpec" xml:"GPUSpec"`
 	LocalStorageCategory string  `json:"LocalStorageCategory" xml:"LocalStorageCategory"`

+ 4 - 2
services/ecs/struct_key_pair.go

@@ -17,6 +17,8 @@ package ecs
 
 // KeyPair is a nested struct in ecs response
 type KeyPair struct {
-	KeyPairName        string `json:"KeyPairName" xml:"KeyPairName"`
-	KeyPairFingerPrint string `json:"KeyPairFingerPrint" xml:"KeyPairFingerPrint"`
+	KeyPairName        string                 `json:"KeyPairName" xml:"KeyPairName"`
+	KeyPairFingerPrint string                 `json:"KeyPairFingerPrint" xml:"KeyPairFingerPrint"`
+	ResourceGroupId    string                 `json:"ResourceGroupId" xml:"ResourceGroupId"`
+	Tags               TagsInDescribeKeyPairs `json:"Tags" xml:"Tags"`
 }

+ 9 - 7
services/ecs/struct_launch_template_set.go

@@ -17,11 +17,13 @@ package ecs
 
 // LaunchTemplateSet is a nested struct in ecs response
 type LaunchTemplateSet struct {
-	CreateTime           string `json:"CreateTime" xml:"CreateTime"`
-	ModifiedTime         string `json:"ModifiedTime" xml:"ModifiedTime"`
-	LaunchTemplateId     string `json:"LaunchTemplateId" xml:"LaunchTemplateId"`
-	LaunchTemplateName   string `json:"LaunchTemplateName" xml:"LaunchTemplateName"`
-	DefaultVersionNumber int    `json:"DefaultVersionNumber" xml:"DefaultVersionNumber"`
-	LatestVersionNumber  int    `json:"LatestVersionNumber" xml:"LatestVersionNumber"`
-	CreatedBy            string `json:"CreatedBy" xml:"CreatedBy"`
+	CreateTime           string                        `json:"CreateTime" xml:"CreateTime"`
+	ModifiedTime         string                        `json:"ModifiedTime" xml:"ModifiedTime"`
+	LaunchTemplateId     string                        `json:"LaunchTemplateId" xml:"LaunchTemplateId"`
+	LaunchTemplateName   string                        `json:"LaunchTemplateName" xml:"LaunchTemplateName"`
+	DefaultVersionNumber int                           `json:"DefaultVersionNumber" xml:"DefaultVersionNumber"`
+	LatestVersionNumber  int                           `json:"LatestVersionNumber" xml:"LatestVersionNumber"`
+	CreatedBy            string                        `json:"CreatedBy" xml:"CreatedBy"`
+	ResourceGroupId      string                        `json:"ResourceGroupId" xml:"ResourceGroupId"`
+	Tags                 TagsInDescribeLaunchTemplates `json:"Tags" xml:"Tags"`
 }

+ 2 - 0
services/ecs/struct_network_interface_set.go

@@ -29,7 +29,9 @@ type NetworkInterfaceSet struct {
 	Description          string                                      `json:"Description" xml:"Description"`
 	InstanceId           string                                      `json:"InstanceId" xml:"InstanceId"`
 	CreationTime         string                                      `json:"CreationTime" xml:"CreationTime"`
+	ResourceGroupId      string                                      `json:"ResourceGroupId" xml:"ResourceGroupId"`
 	SecurityGroupIds     SecurityGroupIdsInDescribeNetworkInterfaces `json:"SecurityGroupIds" xml:"SecurityGroupIds"`
 	AssociatedPublicIp   AssociatedPublicIp                          `json:"AssociatedPublicIp" xml:"AssociatedPublicIp"`
 	PrivateIpSets        PrivateIpSets                               `json:"PrivateIpSets" xml:"PrivateIpSets"`
+	Tags                 TagsInDescribeNetworkInterfaces             `json:"Tags" xml:"Tags"`
 }

+ 1 - 0
services/ecs/struct_permission.go

@@ -19,6 +19,7 @@ package ecs
 type Permission struct {
 	IpProtocol              string `json:"IpProtocol" xml:"IpProtocol"`
 	PortRange               string `json:"PortRange" xml:"PortRange"`
+	SourcePortRange         string `json:"SourcePortRange" xml:"SourcePortRange"`
 	SourceGroupId           string `json:"SourceGroupId" xml:"SourceGroupId"`
 	SourceGroupName         string `json:"SourceGroupName" xml:"SourceGroupName"`
 	SourceCidrIp            string `json:"SourceCidrIp" xml:"SourceCidrIp"`

+ 5 - 4
services/ecs/struct_price.go

@@ -17,8 +17,9 @@ package ecs
 
 // Price is a nested struct in ecs response
 type Price struct {
-	DiscountPrice float64 `json:"DiscountPrice" xml:"DiscountPrice"`
-	TradePrice    float64 `json:"TradePrice" xml:"TradePrice"`
-	OriginalPrice float64 `json:"OriginalPrice" xml:"OriginalPrice"`
-	Currency      string  `json:"Currency" xml:"Currency"`
+	DiscountPrice float64                           `json:"DiscountPrice" xml:"DiscountPrice"`
+	TradePrice    float64                           `json:"TradePrice" xml:"TradePrice"`
+	OriginalPrice float64                           `json:"OriginalPrice" xml:"OriginalPrice"`
+	Currency      string                            `json:"Currency" xml:"Currency"`
+	DetailInfos   DetailInfosInDescribeRenewalPrice `json:"DetailInfos" xml:"DetailInfos"`
 }

+ 25 - 0
services/ecs/struct_resource_price_model.go

@@ -0,0 +1,25 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// ResourcePriceModel is a nested struct in ecs response
+type ResourcePriceModel struct {
+	DiscountPrice float64                        `json:"DiscountPrice" xml:"DiscountPrice"`
+	TradePrice    float64                        `json:"TradePrice" xml:"TradePrice"`
+	OriginalPrice float64                        `json:"OriginalPrice" xml:"OriginalPrice"`
+	Resource      string                         `json:"Resource" xml:"Resource"`
+	SubRules      SubRulesInDescribeRenewalPrice `json:"SubRules" xml:"SubRules"`
+}

+ 10 - 6
services/ecs/struct_resource_type_count.go

@@ -17,10 +17,14 @@ package ecs
 
 // ResourceTypeCount is a nested struct in ecs response
 type ResourceTypeCount struct {
-	Instance      int `json:"Instance" xml:"Instance"`
-	Disk          int `json:"Disk" xml:"Disk"`
-	Volume        int `json:"Volume" xml:"Volume"`
-	Image         int `json:"Image" xml:"Image"`
-	Snapshot      int `json:"Snapshot" xml:"Snapshot"`
-	Securitygroup int `json:"Securitygroup" xml:"Securitygroup"`
+	Instance       int `json:"Instance" xml:"Instance"`
+	Disk           int `json:"Disk" xml:"Disk"`
+	Volume         int `json:"Volume" xml:"Volume"`
+	Image          int `json:"Image" xml:"Image"`
+	Snapshot       int `json:"Snapshot" xml:"Snapshot"`
+	Securitygroup  int `json:"Securitygroup" xml:"Securitygroup"`
+	LaunchTemplate int `json:"LaunchTemplate" xml:"LaunchTemplate"`
+	Eni            int `json:"Eni" xml:"Eni"`
+	Ddh            int `json:"Ddh" xml:"Ddh"`
+	KeyPair        int `json:"KeyPair" xml:"KeyPair"`
 }

+ 1 - 0
services/ecs/struct_security_group.go

@@ -24,5 +24,6 @@ type SecurityGroup struct {
 	CreationTime            string                       `json:"CreationTime" xml:"CreationTime"`
 	AvailableInstanceAmount int                          `json:"AvailableInstanceAmount" xml:"AvailableInstanceAmount"`
 	EcsCount                int                          `json:"EcsCount" xml:"EcsCount"`
+	ResourceGroupId         string                       `json:"ResourceGroupId" xml:"ResourceGroupId"`
 	Tags                    TagsInDescribeSecurityGroups `json:"Tags" xml:"Tags"`
 }

+ 1 - 0
services/ecs/struct_snapshot.go

@@ -32,5 +32,6 @@ type Snapshot struct {
 	Usage             string                  `json:"Usage" xml:"Usage"`
 	SourceStorageType string                  `json:"SourceStorageType" xml:"SourceStorageType"`
 	RemainTime        int                     `json:"RemainTime" xml:"RemainTime"`
+	ResourceGroupId   string                  `json:"ResourceGroupId" xml:"ResourceGroupId"`
 	Tags              TagsInDescribeSnapshots `json:"Tags" xml:"Tags"`
 }

+ 21 - 0
services/ecs/struct_sub_rules_in_describe_price.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// SubRulesInDescribePrice is a nested struct in ecs response
+type SubRulesInDescribePrice struct {
+	Rule []Rule `json:"Rule" xml:"Rule"`
+}

+ 21 - 0
services/ecs/struct_sub_rules_in_describe_renewal_price.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// SubRulesInDescribeRenewalPrice is a nested struct in ecs response
+type SubRulesInDescribeRenewalPrice struct {
+	Rule []Rule `json:"Rule" xml:"Rule"`
+}

+ 21 - 0
services/ecs/struct_tags_in_describe_key_pairs.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// TagsInDescribeKeyPairs is a nested struct in ecs response
+type TagsInDescribeKeyPairs struct {
+	Tag []Tag `json:"Tag" xml:"Tag"`
+}

+ 21 - 0
services/ecs/struct_tags_in_describe_launch_templates.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// TagsInDescribeLaunchTemplates is a nested struct in ecs response
+type TagsInDescribeLaunchTemplates struct {
+	Tag []Tag `json:"Tag" xml:"Tag"`
+}

+ 21 - 0
services/ecs/struct_tags_in_describe_network_interfaces.go

@@ -0,0 +1,21 @@
+package ecs
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+// TagsInDescribeNetworkInterfaces is a nested struct in ecs response
+type TagsInDescribeNetworkInterfaces struct {
+	Tag []Tag `json:"Tag" xml:"Tag"`
+}