Skip to content

Commit 75de781

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.62 (#266)
1 parent 653ea79 commit 75de781

File tree

12 files changed

+316
-84
lines changed

12 files changed

+316
-84
lines changed

‎ucloud/services/udb/schemas/models.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
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+
615
class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
716
"""UDBSlaveInstanceSet - DescribeUDBSlaveInstance"""
817

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

7180

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,11 @@ def reset_uhost_instance_password(
13481348
13491349
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
13501350
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
1351-
- **Password** (str) - (Required) UHost新密码（密码格式使用BASE64编码）
13521351
- **UHostId** (str) - (Required) UHost实例ID
1352+
- **AutoStart** (bool) - 修改密码结束后是否立即开机，默认为false， 如果设置为true，则修改密码成功后立即开机； 抢占式和后付费云主机暂不支持当前功能；
1353+
- **KeyPairId** (str) - KeypairId 密钥对ID，LoginMode为KeyPair时此项必须。
1354+
- **LoginMode** (str) - 主机登陆模式。密码（默认选项）: Password，密钥 KeyPair。
1355+
- **Password** (str) - UHost新密码（密码格式使用BASE64编码）
13531356
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
13541357
13551358
**Response**
@@ -1410,6 +1413,7 @@ def resize_uhost_instance(
14101413
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
14111414
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
14121415
- **UHostId** (str) - (Required) UHost实例ID 参见 `DescribeUHostInstance <https://docs.ucloud.cn/api/uhost-api/describe_uhost_instance.html>`_
1416+
- **AutoStart** (bool) - 扩容结束后是否立即开机，默认为false，如果设置为true，则扩容成功后立即开机；抢占式和后付费云主机暂不支持当前功能；
14131417
- **CPU** (int) - 虚拟CPU核数。可选参数：1-240（可选范围与UHostType相关）。默认值为当前实例的CPU核数
14141418
- **GPU** (int) - GPU卡核心数。仅GPU机型支持此字段（可选范围与MachineType+GpuType相关）
14151419
- **Memory** (int) - 内存大小。单位：MB。范围 ：[1024, 1966080]，取值为1024的倍数（可选范围与UHostType相关）。默认值为当前实例的内存大小。

‎ucloud/services/uhost/schemas/apis.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,10 @@ class ResetUHostInstancePasswordRequestSchema(schema.RequestSchema):
12191219
"""ResetUHostInstancePassword - 重置UHost实例的管理员密码。"""
12201220

12211221
fields = {
1222-
"Password": fields.Base64(required=True, dump_to="Password"),
1222+
"AutoStart": fields.Bool(required=False, dump_to="AutoStart"),
1223+
"KeyPairId": fields.Str(required=False, dump_to="KeyPairId"),
1224+
"LoginMode": fields.Str(required=False, dump_to="LoginMode"),
1225+
"Password": fields.Base64(required=False, dump_to="Password"),
12231226
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
12241227
"Region": fields.Str(required=True, dump_to="Region"),
12251228
"UHostId": fields.Str(required=True, dump_to="UHostId"),
@@ -1279,6 +1282,7 @@ class ResizeUHostInstanceRequestSchema(schema.RequestSchema):
12791282
"""ResizeUHostInstance - 修改指定UHost实例的资源配置，如CPU核心数，内存容量大小，网络增强等。可选配置范围请参考[[api:uhost-api:uhost_type|云主机机型说明]]。"""
12801283

12811284
fields = {
1285+
"AutoStart": fields.Bool(required=False, dump_to="AutoStart"),
12821286
"BootDiskSpace": fields.Int(
12831287
required=False, dump_to="BootDiskSpace"
12841288
), # Deprecated, will be removed at 1.0

‎ucloud/services/uhost/schemas/models.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,6 @@ 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-
4523
class CollectionSchema(schema.ResponseSchema):
4624
"""Collection - CPU和内存可支持的规格"""
4725

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

6442

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

6846
fields = {
69-
"Rate": fields.Int(required=False, load_from="Rate"),
70-
"Value": fields.Float(required=False, load_from="Value"),
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"),
7151
}
7252

7353

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

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

@@ -108,6 +89,16 @@ class FeaturesSchema(schema.ResponseSchema):
10889
}
10990

11091

92+
class DisksSchema(schema.ResponseSchema):
93+
"""Disks - 磁盘信息"""
94+
95+
fields = {
96+
"BootDisk": fields.List(BootDiskInfoSchema()),
97+
"DataDisk": fields.List(DataDiskInfoSchema()),
98+
"Name": fields.Str(required=False, load_from="Name"),
99+
}
100+
101+
111102
class CpuPlatformsSchema(schema.ResponseSchema):
112103
"""CpuPlatforms - CPU平台信息"""
113104

@@ -118,6 +109,15 @@ class CpuPlatformsSchema(schema.ResponseSchema):
118109
}
119110

120111

112+
class PerformanceSchema(schema.ResponseSchema):
113+
"""Performance - GPU的性能指标"""
114+
115+
fields = {
116+
"Rate": fields.Int(required=False, load_from="Rate"),
117+
"Value": fields.Float(required=False, load_from="Value"),
118+
}
119+
120+
121121
class AvailableInstanceTypesSchema(schema.ResponseSchema):
122122
"""AvailableInstanceTypes - https://ushare.ucloudadmin.com/pages/viewpage.action?pageId=104662646"""
123123

@@ -205,14 +205,6 @@ class UHostDiskSetSchema(schema.ResponseSchema):
205205
}
206206

207207

208-
class SpotAttributeSchema(schema.ResponseSchema):
209-
"""SpotAttribute - 竞价实例属性"""
210-
211-
fields = {
212-
"RecycleTime": fields.Int(required=False, load_from="RecycleTime"),
213-
}
214-
215-
216208
class UHostKeyPairSchema(schema.ResponseSchema):
217209
"""UHostKeyPair - 主机密钥信息"""
218210

@@ -232,6 +224,14 @@ class UDSetUDHostAttributeSchema(schema.ResponseSchema):
232224
}
233225

234226

227+
class SpotAttributeSchema(schema.ResponseSchema):
228+
"""SpotAttribute - 竞价实例属性"""
229+
230+
fields = {
231+
"RecycleTime": fields.Int(required=False, load_from="RecycleTime"),
232+
}
233+
234+
235235
class UHostIPSetSchema(schema.ResponseSchema):
236236
"""UHostIPSet - DescribeUHostInstance"""
237237

‎ucloud/services/umem/client.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,7 @@ def describe_umem_upgrade_price(
801801
- **IsSplit** (str) - 如果是拆分按钮查询价格就填 true, 否则就填 false,默认为 false
802802
- **NewCPU** (int) - 代理升级后CPU核数
803803
- **ProxyId** (str) - 代理id
804+
- **ReplicaSize** (int) - 新增读写分离节点容量大小
804805
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
805806
806807
**Response**
@@ -1487,6 +1488,44 @@ def modify_uredis_group_password(
14871488
resp = self.invoke("ModifyURedisGroupPassword", d, **kwargs)
14881489
return apis.ModifyURedisGroupPasswordResponseSchema().loads(resp)
14891490

1491+
def register_umem_defrag(
1492+
self, req: typing.Optional[dict] = None, **kwargs
1493+
) -> dict:
1494+
"""RegisterUMemDefrag - 动态开关redis碎片整理选项
1495+
1496+
**Request**
1497+
1498+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
1499+
- **ResourceId** (str) - (Required) 资源ID
1500+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
1501+
- **EndHour** (int) - 结束整点数值（分布式实例该参数无效）。
1502+
- **EndMin** (int) - 结束分钟数（分布式实例该参数无效）。
1503+
- **EndTime** (int) - 关闭时间戳
1504+
- **FragSize** (int) - 碎片整理阈值，范围为 100-200（分布式实例该参数无效）。
1505+
- **FragTime** (int) - 任务时间周期，单位为分钟。
1506+
- **IsUnion** (bool) - AND逻辑字段，表示 阈值和时间段都满足（分布式实例该参数无效）。
1507+
- **OperateType** (str) - 操作类型：“Once”： 表示单次执行， “Open”：表示开启策略“Close”: 表示关闭策略（分布式实例只支持Once）。
1508+
- **StartHour** (int) - 开始整点数值（分布式实例该参数无效）。
1509+
- **StartMin** (int) - 开始分钟数（分布式实例该参数无效）。
1510+
- **StartTime** (int) - 开始时间戳
1511+
1512+
**Response**
1513+
1514+
1515+
"""
1516+
# build request
1517+
d = {
1518+
"Region": self.config.region,
1519+
}
1520+
req and d.update(req)
1521+
d = apis.RegisterUMemDefragRequestSchema().dumps(d)
1522+
1523+
# build options
1524+
kwargs["max_retries"] = 0 # ignore retry when api is not idempotent
1525+
1526+
resp = self.invoke("RegisterUMemDefrag", d, **kwargs)
1527+
return apis.RegisterUMemDefragResponseSchema().loads(resp)
1528+
14901529
def remove_ud_redis_data(
14911530
self, req: typing.Optional[dict] = None, **kwargs
14921531
) -> dict:

‎ucloud/services/umem/schemas/apis.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,7 @@ class DescribeUMemUpgradePriceRequestSchema(schema.RequestSchema):
628628
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
629629
"ProxyId": fields.Str(required=False, dump_to="ProxyId"),
630630
"Region": fields.Str(required=True, dump_to="Region"),
631+
"ReplicaSize": fields.Int(required=False, dump_to="ReplicaSize"),
631632
"Size": fields.Int(required=True, dump_to="Size"),
632633
"SpaceId": fields.Str(required=True, dump_to="SpaceId"),
633634
"Type": fields.Str(required=True, dump_to="Type"),
@@ -1176,6 +1177,39 @@ class ModifyURedisGroupPasswordResponseSchema(schema.ResponseSchema):
11761177
fields = {}
11771178

11781179

1180+
"""
1181+
API: RegisterUMemDefrag
1182+
1183+
动态开关redis碎片整理选项
1184+
"""
1185+
1186+
1187+
class RegisterUMemDefragRequestSchema(schema.RequestSchema):
1188+
"""RegisterUMemDefrag - 动态开关redis碎片整理选项"""
1189+
1190+
fields = {
1191+
"EndHour": fields.Int(required=False, dump_to="EndHour"),
1192+
"EndMin": fields.Int(required=False, dump_to="EndMin"),
1193+
"EndTime": fields.Int(required=False, dump_to="EndTime"),
1194+
"FragSize": fields.Int(required=False, dump_to="FragSize"),
1195+
"FragTime": fields.Int(required=False, dump_to="FragTime"),
1196+
"IsUnion": fields.Bool(required=False, dump_to="IsUnion"),
1197+
"OperateType": fields.Str(required=False, dump_to="OperateType"),
1198+
"Region": fields.Str(required=True, dump_to="Region"),
1199+
"ResourceId": fields.Str(required=True, dump_to="ResourceId"),
1200+
"StartHour": fields.Int(required=False, dump_to="StartHour"),
1201+
"StartMin": fields.Int(required=False, dump_to="StartMin"),
1202+
"StartTime": fields.Int(required=False, dump_to="StartTime"),
1203+
"Zone": fields.Str(required=True, dump_to="Zone"),
1204+
}
1205+
1206+
1207+
class RegisterUMemDefragResponseSchema(schema.ResponseSchema):
1208+
"""RegisterUMemDefrag - 动态开关redis碎片整理选项"""
1209+
1210+
fields = {}
1211+
1212+
11791213
"""
11801214
API: RemoveUDRedisData
11811215

‎ucloud/services/umem/schemas/models.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ 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+
2837
class UMemSlaveDataSetSchema(schema.ResponseSchema):
2938
"""UMemSlaveDataSet - DescribeUMem"""
3039

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

5766

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/usms/schemas/models.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,6 @@ class ReceiptPerSessionSchema(schema.ResponseSchema):
2626
}
2727

2828

29-
class StatisticsDataSchema(schema.ResponseSchema):
30-
"""StatisticsData - 统计信息"""
31-
32-
fields = {
33-
"FailCostCount": fields.Int(required=True, load_from="FailCostCount"),
34-
"FailCount": fields.Int(required=True, load_from="FailCount"),
35-
"SendCostCount": fields.Int(required=True, load_from="SendCostCount"),
36-
"SendCount": fields.Int(required=True, load_from="SendCount"),
37-
"SubmitFailCostCount": fields.Int(
38-
required=True, load_from="SubmitFailCostCount"
39-
),
40-
"SubmitFailCount": fields.Int(
41-
required=True, load_from="SubmitFailCount"
42-
),
43-
"SuccessCostCount": fields.Int(
44-
required=True, load_from="SuccessCostCount"
45-
),
46-
"SuccessCount": fields.Int(required=True, load_from="SuccessCount"),
47-
"UnknownCostCount": fields.Int(
48-
required=True, load_from="UnknownCostCount"
49-
),
50-
"UnknownCount": fields.Int(required=True, load_from="UnknownCount"),
51-
}
52-
53-
5429
class StatisticsDataInfoSchema(schema.ResponseSchema):
5530
"""StatisticsDataInfo - 统计信息按天聚合"""
5631

@@ -82,6 +57,31 @@ class StatisticsDataInfoSchema(schema.ResponseSchema):
8257
}
8358

8459

60+
class StatisticsDataSchema(schema.ResponseSchema):
61+
"""StatisticsData - 统计信息"""
62+
63+
fields = {
64+
"FailCostCount": fields.Int(required=True, load_from="FailCostCount"),
65+
"FailCount": fields.Int(required=True, load_from="FailCount"),
66+
"SendCostCount": fields.Int(required=True, load_from="SendCostCount"),
67+
"SendCount": fields.Int(required=True, load_from="SendCount"),
68+
"SubmitFailCostCount": fields.Int(
69+
required=True, load_from="SubmitFailCostCount"
70+
),
71+
"SubmitFailCount": fields.Int(
72+
required=True, load_from="SubmitFailCount"
73+
),
74+
"SuccessCostCount": fields.Int(
75+
required=True, load_from="SuccessCostCount"
76+
),
77+
"SuccessCount": fields.Int(required=True, load_from="SuccessCount"),
78+
"UnknownCostCount": fields.Int(
79+
required=True, load_from="UnknownCostCount"
80+
),
81+
"UnknownCount": fields.Int(required=True, load_from="UnknownCount"),
82+
}
83+
84+
8585
class OutSignatureSchema(schema.ResponseSchema):
8686
"""OutSignature - 短信签名"""
8787

0 commit comments

Comments
 (0)