Skip to content

Commit 1d99012

Browse files
authored
sdk: rolling update for 0.22.25 (#428)
1 parent 265d13c commit 1d99012

File tree

8 files changed

+122
-113
lines changed

8 files changed

+122
-113
lines changed

services/udb/apis.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,8 @@ type CreateUDBInstanceRequest struct {
646646
// UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例 "HA": 高可用版UDB实例 默认是"Normal"
647647
InstanceMode *string `required:"false"`
648648

649-
// 【该字段已废弃,请谨慎使用】
650-
InstanceType *string `required:"false" deprecated:"true"`
649+
// UDB数据库机型: "SATA_SSD": "SSD机型" , "PCIE_SSD": "SSD高性能机型" , "Normal_Volume": "标准大容量机型", "SATA_SSD_Volume": "SSD大容量机型" , "PCIE_SSD_Volume": "SSD高性能大容量机型", "NVMe_SSD": "快杰机型"
650+
InstanceType *string `required:"false"`
651651

652652
// 规格类型ID,当SpecificationType为1时有效
653653
MachineType *string `required:"false"`

services/udb/models.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ type UDBBackupSet struct {
4747
Zone string
4848
}
4949

50+
/*
51+
UFileDataSet - 增加ufile的描述
52+
*/
53+
type UFileDataSet struct {
54+
55+
// bucket名称
56+
Bucket string
57+
58+
// Ufile的令牌tokenid
59+
TokenID string
60+
}
61+
5062
/*
5163
UDBSlaveInstanceSet - DescribeUDBSlaveInstance
5264
*/
@@ -173,18 +185,6 @@ type UDBSlaveInstanceSet struct {
173185
Zone string
174186
}
175187

176-
/*
177-
UFileDataSet - 增加ufile的描述
178-
*/
179-
type UFileDataSet struct {
180-
181-
// bucket名称
182-
Bucket string
183-
184-
// Ufile的令牌tokenid
185-
TokenID string
186-
}
187-
188188
/*
189189
UDBInstanceSet - DescribeUDBInstance
190190
*/

services/uhost/apis.go

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ type CreateCustomImageRequest struct {
9090
// [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist)
9191
// Zone *string `required:"false"`
9292

93+
// 【数组】关联的云盘数据盘id列表。注意: 云盘数据盘需要开启快照服务
94+
DataUDiskIds []string `required:"false"`
95+
9396
// 镜像描述
9497
ImageDescription *string `required:"false"`
9598

@@ -104,6 +107,9 @@ type CreateCustomImageRequest struct {
104107
type CreateCustomImageResponse struct {
105108
response.CommonBase
106109

110+
// 云盘数据盘快照id列表
111+
DataSnapshotIds []string
112+
107113
// 镜像Id
108114
ImageId string
109115
}
@@ -195,12 +201,6 @@ func (c *UHostClient) CreateIsolationGroup(req *CreateIsolationGroupRequest) (*C
195201
return &res, nil
196202
}
197203

198-
/*
199-
UHostDiskCustomBackup is request schema for complex param
200-
*/
201-
type UHostDiskCustomBackup struct {
202-
}
203-
204204
/*
205205
CreateUHostInstanceParamNetworkInterfaceIPv6 is request schema for complex param
206206
*/
@@ -231,6 +231,36 @@ type CreateUHostInstanceParamNetworkInterfaceEIP struct {
231231
ShareBandwidthId *string `required:"false"`
232232
}
233233

234+
/*
235+
UHostDiskCustomBackup is request schema for complex param
236+
*/
237+
type UHostDiskCustomBackup struct {
238+
}
239+
240+
/*
241+
CreateUHostInstanceParamNetworkInterface is request schema for complex param
242+
*/
243+
type CreateUHostInstanceParamNetworkInterface struct {
244+
245+
// 申请并绑定一个教育网EIP。True为申请并绑定,False为不会申请绑定,默认False。当前只支持具有HPC特性的机型。
246+
CreateCernetIp *bool `required:"false"`
247+
248+
//
249+
EIP *CreateUHostInstanceParamNetworkInterfaceEIP `required:"false"`
250+
}
251+
252+
/*
253+
CreateUHostInstanceParamVolumes is request schema for complex param
254+
*/
255+
type CreateUHostInstanceParamVolumes struct {
256+
257+
// 【该字段已废弃,请谨慎使用】
258+
CouponId *string `required:"false" deprecated:"true"`
259+
260+
// 【该字段已废弃,请谨慎使用】
261+
IsBoot *string `required:"false" deprecated:"true"`
262+
}
263+
234264
/*
235265
UHostDisk is request schema for complex param
236266
*/
@@ -282,30 +312,6 @@ type CreateUHostInstanceParamFeatures struct {
282312
UNI *bool `required:"false"`
283313
}
284314

285-
/*
286-
CreateUHostInstanceParamNetworkInterface is request schema for complex param
287-
*/
288-
type CreateUHostInstanceParamNetworkInterface struct {
289-
290-
// 申请并绑定一个教育网EIP。True为申请并绑定,False为不会申请绑定,默认False。当前只支持具有HPC特性的机型。
291-
CreateCernetIp *bool `required:"false"`
292-
293-
//
294-
EIP *CreateUHostInstanceParamNetworkInterfaceEIP `required:"false"`
295-
}
296-
297-
/*
298-
CreateUHostInstanceParamVolumes is request schema for complex param
299-
*/
300-
type CreateUHostInstanceParamVolumes struct {
301-
302-
// 【该字段已废弃,请谨慎使用】
303-
CouponId *string `required:"false" deprecated:"true"`
304-
305-
// 【该字段已废弃,请谨慎使用】
306-
IsBoot *string `required:"false" deprecated:"true"`
307-
}
308-
309315
// CreateUHostInstanceRequest is request schema for CreateUHostInstance action
310316
type CreateUHostInstanceRequest struct {
311317
request.CommonBase
@@ -1150,21 +1156,6 @@ func (c *UHostClient) GetAttachedDiskUpgradePrice(req *GetAttachedDiskUpgradePri
11501156
return &res, nil
11511157
}
11521158

1153-
/*
1154-
GetUHostInstancePriceParamVolumes is request schema for complex param
1155-
*/
1156-
type GetUHostInstancePriceParamVolumes struct {
1157-
1158-
// 【该字段已废弃,请谨慎使用】
1159-
IsBoot *string `required:"false" deprecated:"true"`
1160-
1161-
// 【该字段已废弃,请谨慎使用】
1162-
Size *int `required:"false" deprecated:"true"`
1163-
1164-
// 【该字段已废弃,请谨慎使用】
1165-
Type *string `required:"false" deprecated:"true"`
1166-
}
1167-
11681159
/*
11691160
getUHostInstancePriceParamDisks is request schema for complex param
11701161
*/
@@ -1183,6 +1174,21 @@ type getUHostInstancePriceParamDisks struct {
11831174
Type *string `required:"true"`
11841175
}
11851176

1177+
/*
1178+
GetUHostInstancePriceParamVolumes is request schema for complex param
1179+
*/
1180+
type GetUHostInstancePriceParamVolumes struct {
1181+
1182+
// 【该字段已废弃,请谨慎使用】
1183+
IsBoot *string `required:"false" deprecated:"true"`
1184+
1185+
// 【该字段已废弃,请谨慎使用】
1186+
Size *int `required:"false" deprecated:"true"`
1187+
1188+
// 【该字段已废弃,请谨慎使用】
1189+
Type *string `required:"false" deprecated:"true"`
1190+
}
1191+
11861192
// GetUHostInstancePriceRequest is request schema for GetUHostInstancePrice action
11871193
type GetUHostInstancePriceRequest struct {
11881194
request.CommonBase

services/uhost/models.go

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ type UHostImageSet struct {
214214
// 创建时间,格式为Unix时间戳
215215
CreateTime int
216216

217+
// 关联的云盘数据盘快照Id列表
218+
DataSnapshotIds []string
219+
217220
// 特殊状态标识,目前包含NetEnhnced(网络增强1.0), NetEnhanced_Ultra(网络增强2.0), NetEnhanced_Extreme(网络增强3.0), HotPlug(热升级), GPU(GPU镜像),CloudInit, IPv6(支持IPv6网络),RssdAttachable(支持RSSD云盘),Vgpu_AMD(支持AMD的vgpu),Vgpu_NVIDIA(支持NVIDIA的vgpu),Aarch64_Type(支持arm64架构)
218221
Features []string
219222

@@ -317,15 +320,6 @@ type UDSetUDHostAttribute struct {
317320
UDSetId string
318321
}
319322

320-
/*
321-
SpotAttribute - 竞价实例属性
322-
*/
323-
type SpotAttribute struct {
324-
325-
// 回收时间
326-
RecycleTime int
327-
}
328-
329323
/*
330324
UHostDiskSet - DescribeUHostInstance
331325
*/
@@ -359,18 +353,6 @@ type UHostDiskSet struct {
359353
Type string
360354
}
361355

362-
/*
363-
UHostKeyPair - 主机密钥信息
364-
*/
365-
type UHostKeyPair struct {
366-
367-
// 密钥对ID
368-
KeyPairId string
369-
370-
// 主机密钥对状态,Normal 正常,Deleted 删除
371-
KeyPairState string
372-
}
373-
374356
/*
375357
UHostIPSet - DescribeUHostInstance
376358
*/
@@ -410,6 +392,27 @@ type UHostIPSet struct {
410392
Weight int
411393
}
412394

395+
/*
396+
UHostKeyPair - 主机密钥信息
397+
*/
398+
type UHostKeyPair struct {
399+
400+
// 密钥对ID
401+
KeyPairId string
402+
403+
// 主机密钥对状态,Normal 正常,Deleted 删除
404+
KeyPairState string
405+
}
406+
407+
/*
408+
SpotAttribute - 竞价实例属性
409+
*/
410+
type SpotAttribute struct {
411+
412+
// 回收时间
413+
RecycleTime int
414+
}
415+
413416
/*
414417
UHostInstanceSet - DescribeUHostInstance
415418
*/

services/umem/models.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@ type UDRedisSlowlogSet struct {
3838
StartTime int
3939
}
4040

41-
/*
42-
UMemSpaceAddressSet - DescribeUMemSpace
43-
*/
44-
type UMemSpaceAddressSet struct {
45-
46-
// UMem实例访问IP
47-
IP string
48-
49-
// UMem实例访问Port
50-
Port int
51-
}
52-
5341
/*
5442
UMemSlaveDataSet - DescribeUMem
5543
*/
@@ -125,6 +113,18 @@ type UMemSlaveDataSet struct {
125113
Zone string
126114
}
127115

116+
/*
117+
UMemSpaceAddressSet - DescribeUMemSpace
118+
*/
119+
type UMemSpaceAddressSet struct {
120+
121+
// UMem实例访问IP
122+
IP string
123+
124+
// UMem实例访问Port
125+
Port int
126+
}
127+
128128
/*
129129
UMemDataSet - DescribeUMem
130130
*/

services/unet/models.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ type UnetBandwidthUsageEIPSet struct {
7878
}
7979

8080
/*
81-
EIPBinding - EIP绑定内网IP关系数据
81+
ShareBandwidthSet - DescribeEIP
8282
*/
83-
type EIPBinding struct {
83+
type ShareBandwidthSet struct {
8484

85-
// 外网ip
86-
EIP string
85+
// 共享带宽带宽值
86+
ShareBandwidth int
8787

88-
// 内网ip
89-
PrivateIP string
88+
// 共享带宽ID
89+
ShareBandwidthId string
9090

91-
// 内网ip类型:PrimaryIP(默认)、SecondaryIP(非默认)
92-
PrivateIPType string
91+
// 共享带宽的资源名称
92+
ShareBandwidthName string
9393
}
9494

9595
/*
@@ -123,18 +123,18 @@ type UnetEIPResourceSet struct {
123123
}
124124

125125
/*
126-
ShareBandwidthSet - DescribeEIP
126+
EIPBinding - EIP绑定内网IP关系数据
127127
*/
128-
type ShareBandwidthSet struct {
128+
type EIPBinding struct {
129129

130-
// 共享带宽带宽值
131-
ShareBandwidth int
130+
// 外网ip
131+
EIP string
132132

133-
// 共享带宽ID
134-
ShareBandwidthId string
133+
// 内网ip
134+
PrivateIP string
135135

136-
// 共享带宽的资源名称
137-
ShareBandwidthName string
136+
// 内网ip类型:PrimaryIP(默认)、SecondaryIP(非默认)
137+
PrivateIPType string
138138
}
139139

140140
/*

tests/setup_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ import (
6060
"github.com/ucloud/ucloud-sdk-go/services/tidb"
6161
"github.com/ucloud/ucloud-sdk-go/services/ubox"
6262
"github.com/ucloud/ucloud-sdk-go/services/ucdn"
63-
"github.com/ucloud/ucloud-sdk-go/services/udns"
6463
"github.com/ucloud/ucloud-sdk-go/services/udts"
6564
"github.com/ucloud/ucloud-sdk-go/services/uec"
6665
"github.com/ucloud/ucloud-sdk-go/services/ufs"
6766
"github.com/ucloud/ucloud-sdk-go/services/uk8s"
6867
"github.com/ucloud/ucloud-sdk-go/services/umedia"
6968
"github.com/ucloud/ucloud-sdk-go/services/unvs"
69+
"github.com/ucloud/ucloud-sdk-go/services/usms"
7070
)
7171

7272
func TestMain(m *testing.M) {
@@ -178,9 +178,6 @@ func testSetup() {
178178
spec.AddFixture("UDB", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
179179
return udb.NewClient(&cfg, &credential), nil
180180
}))
181-
spec.AddFixture("UDNS", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
182-
return udns.NewClient(&cfg, &credential), nil
183-
}))
184181
spec.AddFixture("UDPN", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
185182
return udpn.NewClient(&cfg, &credential), nil
186183
}))
@@ -223,6 +220,9 @@ func testSetup() {
223220
spec.AddFixture("UPHost", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
224221
return uphost.NewClient(&cfg, &credential), nil
225222
}))
223+
spec.AddFixture("USMS", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
224+
return usms.NewClient(&cfg, &credential), nil
225+
}))
226226
spec.AddFixture("VPC", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) {
227227
return vpc.NewClient(&cfg, &credential), nil
228228
}))

ucloud/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package version
22

3-
const Version = "0.22.24"
3+
const Version = "0.22.25"

0 commit comments

Comments
 (0)