Skip to content

Commit 653ea79

Browse files
authored
sdk: rolling update for 0.11.61 (#265)
1 parent 638a96a commit 653ea79

File tree

9 files changed

+95
-88
lines changed

9 files changed

+95
-88
lines changed

ucloud/services/udb/client.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ def create_udb_instance(
321321
- **DBSubVersion** (str) - mysql小版本号,支持指定小版本创建
322322
- **DisableSemisync** (bool) - 是否开启异步高可用,默认不填,可置为true
323323
- **InstanceMode** (str) - UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例 "HA": 高可用版UDB实例 默认是"Normal"
324+
- **InstanceType** (str) - UDB数据库机型: "SATA_SSD": "SSD机型" , "PCIE_SSD": "SSD高性能机型" , "Normal_Volume": "标准大容量机型", "SATA_SSD_Volume": "SSD大容量机型" , "PCIE_SSD_Volume": "SSD高性能大容量机型", "NVMe_SSD": "快杰机型"
324325
- **MachineType** (str) - 规格类型ID,当SpecificationType为1时有效
325326
- **MemoryLimit** (int) - 内存限制(MB),目前支持以下几档 2000M/4000M/ 6000M/8000M/12000M/16000M/ 24000M/32000M/48000M/ 64000M/96000M/128000M/192000M/256000M/320000M
326327
- **Quantity** (int) - 购买时长,默认值1
@@ -777,7 +778,7 @@ def describe_mongo_db_sharded_cluster(
777778
- **ReplicationDelaySeconds** (int) -
778779
- **Role** (str) -
779780
- **SSDType** (str) -
780-
- **SpecificationType** (str) -
781+
- **SpecificationType** (int) -
781782
- **SrcDBId** (str) -
782783
- **State** (str) -
783784
- **SubnetId** (str) -

ucloud/services/udb/schemas/apis.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,7 @@ class CreateUDBInstanceRequestSchema(schema.RequestSchema):
306306
required=False, dump_to="HAArch"
307307
), # Deprecated, will be removed at 1.0
308308
"InstanceMode": fields.Str(required=False, dump_to="InstanceMode"),
309-
"InstanceType": fields.Str(
310-
required=False, dump_to="InstanceType"
311-
), # Deprecated, will be removed at 1.0
309+
"InstanceType": fields.Str(required=False, dump_to="InstanceType"),
312310
"MachineType": fields.Str(required=False, dump_to="MachineType"),
313311
"MemoryLimit": fields.Int(required=False, dump_to="MemoryLimit"),
314312
"Name": fields.Str(required=True, dump_to="Name"),

ucloud/services/udb/schemas/models.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
from ucloud.core.typesystem import schema, fields
44

55

6-
class UFileDataSetSchema(schema.ResponseSchema):
7-
"""UFileDataSet - 增加ufile的描述"""
8-
9-
fields = {
10-
"Bucket": fields.Str(required=False, load_from="Bucket"),
11-
"TokenID": fields.Str(required=False, load_from="TokenID"),
12-
}
13-
14-
156
class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
167
"""UDBSlaveInstanceSet - DescribeUDBSlaveInstance"""
178

@@ -78,6 +69,15 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
7869
}
7970

8071

72+
class UFileDataSetSchema(schema.ResponseSchema):
73+
"""UFileDataSet - 增加ufile的描述"""
74+
75+
fields = {
76+
"Bucket": fields.Str(required=False, load_from="Bucket"),
77+
"TokenID": fields.Str(required=False, load_from="TokenID"),
78+
}
79+
80+
8181
class MongoDBShardedClusterSetSchema(schema.ResponseSchema):
8282
"""MongoDBShardedClusterSet -"""
8383

ucloud/services/uhost/client.py

+3
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ def create_custom_image(
5959
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
6060
- **ImageName** (str) - (Required) 镜像名称
6161
- **UHostId** (str) - (Required) UHost实例ID 参见 `DescribeUHostInstance <https://docs.ucloud.cn/api/uhost-api/describe_uhost_instance.html>`_
62+
- **DataUDiskIds** (list) - 【数组】关联的云盘数据盘id列表。注意: 云盘数据盘需要开启快照服务
6263
- **ImageDescription** (str) - 镜像描述
6364
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
6465
6566
**Response**
6667
68+
- **DataSnapshotIds** (list) - 云盘数据盘快照id列表
6769
- **ImageId** (str) - 镜像Id
6870
6971
"""
@@ -459,6 +461,7 @@ def describe_image(
459461
460462
**UHostImageSet**
461463
- **CreateTime** (int) - 创建时间,格式为Unix时间戳
464+
- **DataSnapshotIds** (list) - 关联的云盘数据盘快照Id列表
462465
- **Features** (list) - 特殊状态标识,目前包含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架构)
463466
- **FuncType** (str) - 镜像归属,枚举值:["gpu","app","uhost"]。"gpu": 对gpu进行处理过的行业镜像;"app":轻量云主机专用的镜像;"uhost":云主机镜像市场的行业镜像
464467
- **ImageDescription** (str) - 镜像描述

ucloud/services/uhost/schemas/apis.py

+4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class CreateCustomImageRequestSchema(schema.RequestSchema):
5353
"""CreateCustomImage - 从指定UHost实例,生成自定义镜像。"""
5454

5555
fields = {
56+
"DataUDiskIds": fields.List(fields.Str()),
5657
"ImageDescription": fields.Str(
5758
required=False, dump_to="ImageDescription"
5859
),
@@ -68,6 +69,9 @@ class CreateCustomImageResponseSchema(schema.ResponseSchema):
6869
"""CreateCustomImage - 从指定UHost实例,生成自定义镜像。"""
6970

7071
fields = {
72+
"DataSnapshotIds": fields.List(
73+
fields.Str(), required=False, load_from="DataSnapshotIds"
74+
),
7175
"ImageId": fields.Str(required=False, load_from="ImageId"),
7276
}
7377

ucloud/services/uhost/schemas/models.py

+56-55
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,28 @@ class KeyPairSchema(schema.ResponseSchema):
2020
}
2121

2222

23+
class DataDiskInfoSchema(schema.ResponseSchema):
24+
"""DataDiskInfo - 数据盘信息"""
25+
26+
fields = {
27+
"Features": fields.List(fields.Str()),
28+
"MaximalSize": fields.Int(required=False, load_from="MaximalSize"),
29+
"MinimalSize": fields.Int(required=False, load_from="MinimalSize"),
30+
"Name": fields.Str(required=False, load_from="Name"),
31+
}
32+
33+
34+
class BootDiskInfoSchema(schema.ResponseSchema):
35+
"""BootDiskInfo - 系统盘信息"""
36+
37+
fields = {
38+
"Features": fields.List(fields.Str()),
39+
"InstantResize": fields.Bool(required=False, load_from="InstantResize"),
40+
"MaximalSize": fields.Int(required=False, load_from="MaximalSize"),
41+
"Name": fields.Str(required=False, load_from="Name"),
42+
}
43+
44+
2345
class CollectionSchema(schema.ResponseSchema):
2446
"""Collection - CPU和内存可支持的规格"""
2547

@@ -40,24 +62,21 @@ class FeatureModesSchema(schema.ResponseSchema):
4062
}
4163

4264

43-
class DataDiskInfoSchema(schema.ResponseSchema):
44-
"""DataDiskInfo - 数据盘信息"""
65+
class PerformanceSchema(schema.ResponseSchema):
66+
"""Performance - GPU的性能指标"""
4567

4668
fields = {
47-
"Features": fields.List(fields.Str()),
48-
"MaximalSize": fields.Int(required=False, load_from="MaximalSize"),
49-
"MinimalSize": fields.Int(required=False, load_from="MinimalSize"),
50-
"Name": fields.Str(required=False, load_from="Name"),
69+
"Rate": fields.Int(required=False, load_from="Rate"),
70+
"Value": fields.Float(required=False, load_from="Value"),
5171
}
5272

5373

54-
class BootDiskInfoSchema(schema.ResponseSchema):
55-
"""BootDiskInfo - 系统盘信息"""
74+
class DisksSchema(schema.ResponseSchema):
75+
"""Disks - 磁盘信息"""
5676

5777
fields = {
58-
"Features": fields.List(fields.Str()),
59-
"InstantResize": fields.Bool(required=False, load_from="InstantResize"),
60-
"MaximalSize": fields.Int(required=False, load_from="MaximalSize"),
78+
"BootDisk": fields.List(BootDiskInfoSchema()),
79+
"DataDisk": fields.List(DataDiskInfoSchema()),
6180
"Name": fields.Str(required=False, load_from="Name"),
6281
}
6382

@@ -80,15 +99,6 @@ class GraphicsMemorySchema(schema.ResponseSchema):
8099
}
81100

82101

83-
class PerformanceSchema(schema.ResponseSchema):
84-
"""Performance - GPU的性能指标"""
85-
86-
fields = {
87-
"Rate": fields.Int(required=False, load_from="Rate"),
88-
"Value": fields.Float(required=False, load_from="Value"),
89-
}
90-
91-
92102
class FeaturesSchema(schema.ResponseSchema):
93103
"""Features - 虚机可支持的特性"""
94104

@@ -98,16 +108,6 @@ class FeaturesSchema(schema.ResponseSchema):
98108
}
99109

100110

101-
class DisksSchema(schema.ResponseSchema):
102-
"""Disks - 磁盘信息"""
103-
104-
fields = {
105-
"BootDisk": fields.List(BootDiskInfoSchema()),
106-
"DataDisk": fields.List(DataDiskInfoSchema()),
107-
"Name": fields.Str(required=False, load_from="Name"),
108-
}
109-
110-
111111
class CpuPlatformsSchema(schema.ResponseSchema):
112112
"""CpuPlatforms - CPU平台信息"""
113113

@@ -140,6 +140,7 @@ class UHostImageSetSchema(schema.ResponseSchema):
140140

141141
fields = {
142142
"CreateTime": fields.Int(required=False, load_from="CreateTime"),
143+
"DataSnapshotIds": fields.List(fields.Str()),
143144
"Features": fields.List(fields.Str()),
144145
"FuncType": fields.Str(required=False, load_from="FuncType"),
145146
"ImageDescription": fields.Str(
@@ -188,6 +189,22 @@ class IsolationGroupSchema(schema.ResponseSchema):
188189
}
189190

190191

192+
class UHostDiskSetSchema(schema.ResponseSchema):
193+
"""UHostDiskSet - DescribeUHostInstance"""
194+
195+
fields = {
196+
"BackupType": fields.Str(required=False, load_from="BackupType"),
197+
"DiskId": fields.Str(required=False, load_from="DiskId"),
198+
"DiskType": fields.Str(required=True, load_from="DiskType"),
199+
"Drive": fields.Str(required=False, load_from="Drive"),
200+
"Encrypted": fields.Str(required=False, load_from="Encrypted"),
201+
"IsBoot": fields.Str(required=True, load_from="IsBoot"),
202+
"Name": fields.Str(required=False, load_from="Name"),
203+
"Size": fields.Int(required=False, load_from="Size"),
204+
"Type": fields.Str(required=False, load_from="Type"),
205+
}
206+
207+
191208
class SpotAttributeSchema(schema.ResponseSchema):
192209
"""SpotAttribute - 竞价实例属性"""
193210

@@ -196,6 +213,15 @@ class SpotAttributeSchema(schema.ResponseSchema):
196213
}
197214

198215

216+
class UHostKeyPairSchema(schema.ResponseSchema):
217+
"""UHostKeyPair - 主机密钥信息"""
218+
219+
fields = {
220+
"KeyPairId": fields.Str(required=False, load_from="KeyPairId"),
221+
"KeyPairState": fields.Str(required=False, load_from="KeyPairState"),
222+
}
223+
224+
199225
class UDSetUDHostAttributeSchema(schema.ResponseSchema):
200226
"""UDSetUDHostAttribute - 私有专区对应的宿主机属性"""
201227

@@ -226,31 +252,6 @@ class UHostIPSetSchema(schema.ResponseSchema):
226252
}
227253

228254

229-
class UHostDiskSetSchema(schema.ResponseSchema):
230-
"""UHostDiskSet - DescribeUHostInstance"""
231-
232-
fields = {
233-
"BackupType": fields.Str(required=False, load_from="BackupType"),
234-
"DiskId": fields.Str(required=False, load_from="DiskId"),
235-
"DiskType": fields.Str(required=True, load_from="DiskType"),
236-
"Drive": fields.Str(required=False, load_from="Drive"),
237-
"Encrypted": fields.Str(required=False, load_from="Encrypted"),
238-
"IsBoot": fields.Str(required=True, load_from="IsBoot"),
239-
"Name": fields.Str(required=False, load_from="Name"),
240-
"Size": fields.Int(required=False, load_from="Size"),
241-
"Type": fields.Str(required=False, load_from="Type"),
242-
}
243-
244-
245-
class UHostKeyPairSchema(schema.ResponseSchema):
246-
"""UHostKeyPair - 主机密钥信息"""
247-
248-
fields = {
249-
"KeyPairId": fields.Str(required=False, load_from="KeyPairId"),
250-
"KeyPairState": fields.Str(required=False, load_from="KeyPairState"),
251-
}
252-
253-
254255
class UHostInstanceSetSchema(schema.ResponseSchema):
255256
"""UHostInstanceSet - DescribeUHostInstance"""
256257

ucloud/services/umem/schemas/models.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ class UDRedisSlowlogSetSchema(schema.ResponseSchema):
2525
}
2626

2727

28-
class UMemSpaceAddressSetSchema(schema.ResponseSchema):
29-
"""UMemSpaceAddressSet - DescribeUMemSpace"""
30-
31-
fields = {
32-
"IP": fields.Str(required=False, load_from="IP"),
33-
"Port": fields.Int(required=False, load_from="Port"),
34-
}
35-
36-
3728
class UMemSlaveDataSetSchema(schema.ResponseSchema):
3829
"""UMemSlaveDataSet - DescribeUMem"""
3930

@@ -64,6 +55,15 @@ class UMemSlaveDataSetSchema(schema.ResponseSchema):
6455
}
6556

6657

58+
class UMemSpaceAddressSetSchema(schema.ResponseSchema):
59+
"""UMemSpaceAddressSet - DescribeUMemSpace"""
60+
61+
fields = {
62+
"IP": fields.Str(required=False, load_from="IP"),
63+
"Port": fields.Int(required=False, load_from="Port"),
64+
}
65+
66+
6767
class UMemDataSetSchema(schema.ResponseSchema):
6868
"""UMemDataSet - DescribeUMem"""
6969

ucloud/services/unet/schemas/models.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ class UnetEIPResourceSetSchema(schema.ResponseSchema):
7676
}
7777

7878

79+
class EIPBindingSchema(schema.ResponseSchema):
80+
"""EIPBinding - EIP绑定内网IP关系数据"""
81+
82+
fields = {
83+
"EIP": fields.Str(required=False, load_from="EIP"),
84+
"PrivateIP": fields.Str(required=False, load_from="PrivateIP"),
85+
"PrivateIPType": fields.Str(required=False, load_from="PrivateIPType"),
86+
}
87+
88+
7989
class ShareBandwidthSetSchema(schema.ResponseSchema):
8090
"""ShareBandwidthSet - DescribeEIP"""
8191

@@ -92,16 +102,6 @@ class ShareBandwidthSetSchema(schema.ResponseSchema):
92102
}
93103

94104

95-
class EIPBindingSchema(schema.ResponseSchema):
96-
"""EIPBinding - EIP绑定内网IP关系数据"""
97-
98-
fields = {
99-
"EIP": fields.Str(required=False, load_from="EIP"),
100-
"PrivateIP": fields.Str(required=False, load_from="PrivateIP"),
101-
"PrivateIPType": fields.Str(required=False, load_from="PrivateIPType"),
102-
}
103-
104-
105105
class UnetEIPSetSchema(schema.ResponseSchema):
106106
"""UnetEIPSet - DescribeEIP"""
107107

ucloud/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.11.60"
1+
version = "0.11.61"

0 commit comments

Comments
 (0)