Skip to content

Commit 0a2d44e

Browse files
authored
sdk: rolling update for 0.11.57 (#261)
1 parent bb47579 commit 0a2d44e

File tree

4 files changed

+128
-21
lines changed

4 files changed

+128
-21
lines changed

ucloud/services/umem/client.py

+63-10
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,39 @@ def check_uredis_allowance(
7474
resp = self.invoke("CheckURedisAllowance", d, **kwargs)
7575
return apis.CheckURedisAllowanceResponseSchema().loads(resp)
7676

77+
def create_scan_hot_big_keys(
78+
self, req: typing.Optional[dict] = None, **kwargs
79+
) -> dict:
80+
"""CreateScanHotBigKeys - 创建执行扫大key和热key的任务
81+
82+
**Request**
83+
84+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
85+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
86+
- **GroupId** (str) - (Required) 资源id
87+
- **Type** (str) - (Required) 任务类型。"ScanBigKeys":扫大key,"ScanHotKeys":扫热key
88+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
89+
- **IsRetry** (bool) - 是否要重试任务,如果是的话,TaskId必填
90+
- **TaskId** (str) - 要重试的任务id
91+
92+
**Response**
93+
94+
95+
"""
96+
# build request
97+
d = {
98+
"ProjectId": self.config.project_id,
99+
"Region": self.config.region,
100+
}
101+
req and d.update(req)
102+
d = apis.CreateScanHotBigKeysRequestSchema().dumps(d)
103+
104+
# build options
105+
kwargs["max_retries"] = 0 # ignore retry when api is not idempotent
106+
107+
resp = self.invoke("CreateScanHotBigKeys", d, **kwargs)
108+
return apis.CreateScanHotBigKeysResponseSchema().loads(resp)
109+
77110
def create_umem_backup(
78111
self, req: typing.Optional[dict] = None, **kwargs
79112
) -> dict:
@@ -120,17 +153,20 @@ def create_umem_space(
120153
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
121154
- **BlockCnt** (int) - 分片个数
122155
- **ChargeType** (str) - Year , Month, Dynamic 默认: Month
123-
- **ClusterMode** (str) - 是否是cluster模式(参数为cluster创建redis cluster,其他参数或者不传该参数仍然创建老版本分布式)
156+
- **ClusterMode** (str) - 【待废弃】是否是cluster模式(参数为cluster创建redis cluster,其他参数或者不传该参数仍然创建老版本分布式)
124157
- **CouponId** (str) - 使用的代金券id
125158
- **HighPerformance** (bool) - 是否创建性能增强性。默认为false,或者不填,填true为性能增强型。
126159
- **Password** (str) - URedis密码。请遵照 `字段规范 <https://docs.ucloud.cn/api/uhost-api/specification>`_ 设定密码。密码需使用base64进行编码,举例如下:# echo -n Password1 | base64UGFzc3dvcmQx。
160+
- **Port** (int) - 分片端口, 默认为 6379
127161
- **Protocol** (str) - 协议:memcache, redis (默认redis).注意:redis无single类型
128-
- **ProxySize** (int) - 分布式代理CPU核数
162+
- **ProxyPort** (int) - 代理端口, 默认为 6379
163+
- **ProxySize** (int) - 分布式代理CPU核数,不填或者传0时默认不创建代理
129164
- **Quantity** (int) - 购买时长 默认: 1
130165
- **SlaveZone** (str) - 跨机房UDRedis,slave所在可用区(必须和Zone在同一Region,且不可相同)
131166
- **SubnetId** (str) - 子网ID
132-
- **Tag** (str) -
167+
- **Tag** (str) - 业务组名称
133168
- **Type** (str) - 空间类型:single(无热备),double(热备)(默认: double)
169+
- **UlbMode** (bool) - 是否创建负载均衡型分布式代理,true时表示创建负载均衡型代理
134170
- **VPCId** (str) - VPC的ID
135171
- **Version** (str) - 分布式分片版本(默认版本是4.0,其他版本见DescribeUDRedisBlockVersion)
136172
@@ -239,6 +275,7 @@ def create_uredis_group(
239275
- **HighAvailability** (str) - (Required) 是否开启高可用,enable或disable
240276
- **Name** (str) - (Required) 请求创建组的名称 (范围[6-63],只能包含英文、数字以及符号-和_)
241277
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
278+
- **AOFID** (str) - 回档的AOF文件ID
242279
- **AutoBackup** (str) - 是否自动备份,enable或disable,默认disable
243280
- **BackupId** (str) - 有此项代表从备份中创建,无代表正常创建
244281
- **BackupTime** (int) - 自动备份开始时间,范围[0-23],默认3点
@@ -249,7 +286,10 @@ def create_uredis_group(
249286
- **HighPerformance** (bool) - 是否创建高性能Redis, 默认为false, 或者不填, 创建高性能为true
250287
- **MasterGroupId** (str) - Master Redis Group的ID,创建只读Slave时,必须填写
251288
- **Password** (str) - 初始化密码,需要 base64 编码
289+
- **Port** (int) - 端口
252290
- **Quantity** (int) - 购买时长,默认为1
291+
- **RollbackGroupId** (str) - 如果是通过回档创建实例,需要传回档实例的GroupId
292+
- **RollbackTime** (int) - 回档时间点
253293
- **Size** (int) - 每个节点的内存大小,单位GB,默认1GB,目前仅支持1/2/4/8/16/32,六种
254294
- **SlaveZone** (str) - 跨机房URedis,slave所在可用区(必须和Zone在同一Region,且不可相同)
255295
- **SubnetId** (str) - 子网ID
@@ -659,6 +699,7 @@ def describe_umem_price(
659699
- **HighPerformance** (bool) - 实例类型是否为性能增强型。默认为false,或者不填,true为性能增强型。
660700
- **ProxySize** (int) - umem 代理CPU核心数
661701
- **Quantity** (int) - 购买UMem的时长,默认值为1
702+
- **UlbMode** (str) - umem分布式代理类型,默认false,true为负载均衡型代理
662703
663704
**Response**
664705
@@ -754,6 +795,12 @@ def describe_umem_upgrade_price(
754795
- **Size** (int) - (Required) 购买UMem大小,单位:GB
755796
- **SpaceId** (str) - (Required) 需要升级的空间的SpaceId
756797
- **Type** (str) - (Required) 空间类型:single(无热备),double(热备)(默认: double)
798+
- **BlockIds** (list) - 进行容量调整分片的分片ID(性能增强型不需要传入)
799+
- **BlockSize** (list) - 进行容量调整的分片的目标容量,单位 GB(性能增强型不需要传入)
800+
- **HighPerformance** (str) - 是否为性能增强型。默认为false,或者不填,true为性能增强型。
801+
- **IsSplit** (str) - 如果是拆分按钮查询价格就填 true, 否则就填 false,默认为 false
802+
- **NewCPU** (int) - 代理升级后CPU核数
803+
- **ProxyId** (str) - 代理id
757804
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
758805
759806
**Response**
@@ -1170,18 +1217,22 @@ def describe_uredis_upgrade_price(
11701217
11711218
**Request**
11721219
1173-
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist.html>`_
1220+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
1221+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
11741222
- **GroupId** (str) - (Required) 要升级的空间的GroupId,请参考DescribeURedisGroup接口
11751223
- **Size** (int) - (Required) 购买uredis大小,单位:GB,范围是[1-32]
1176-
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist.html>`_
1224+
- **HighPerformance** (bool) - 查询高性能Redis, 默认为false, 或者不填, 查询高性能为true
1225+
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
11771226
11781227
**Response**
11791228
1180-
- **Price** (float) - 扩容差价,单位: 元,保留小数点后两位有效数字
1229+
- **OriginalPrice** (int) - 原价
1230+
- **Price** (float) - 价格
11811231
11821232
"""
11831233
# build request
11841234
d = {
1235+
"ProjectId": self.config.project_id,
11851236
"Region": self.config.region,
11861237
}
11871238
req and d.update(req)
@@ -1492,14 +1543,16 @@ def resize_uredis_group(
14921543
14931544
**Request**
14941545
1495-
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list.html>`_
1496-
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist.html>`_
1546+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
1547+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
14971548
- **GroupId** (str) - (Required) 组ID
14981549
- **Size** (int) - (Required) 内存大小, 单位:GB (需要大于原size,且小于等于32) 目前仅支持1/2/4/8/16/32 G 六种容量规格
1499-
- **ChargeType** (str) -
1550+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
1551+
- **ChargeType** (str) - 计费类型
15001552
- **CouponId** (int) - 代金券ID 请参考DescribeCoupon接口
1553+
- **HighPerformance** (bool) - 高性能Redis, 默认为false, 或者不填, 高性能为true
1554+
- **StartTime** (int) - 任务执行时间戳,默认为0或者不传时,为立即执行,传入时间需满足未来一天范围
15011555
- **Type** (str) - 空间类型:single(无热备),double(热备)(默认: double)
1502-
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist.html>`_
15031556
15041557
**Response**
15051558

ucloud/services/umem/schemas/apis.py

+55-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,33 @@ class CheckURedisAllowanceResponseSchema(schema.ResponseSchema):
6666
}
6767

6868

69+
"""
70+
API: CreateScanHotBigKeys
71+
72+
创建执行扫大key和热key的任务
73+
"""
74+
75+
76+
class CreateScanHotBigKeysRequestSchema(schema.RequestSchema):
77+
"""CreateScanHotBigKeys - 创建执行扫大key和热key的任务"""
78+
79+
fields = {
80+
"GroupId": fields.Str(required=True, dump_to="GroupId"),
81+
"IsRetry": fields.Bool(required=False, dump_to="IsRetry"),
82+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
83+
"Region": fields.Str(required=True, dump_to="Region"),
84+
"TaskId": fields.Str(required=False, dump_to="TaskId"),
85+
"Type": fields.Str(required=True, dump_to="Type"),
86+
"Zone": fields.Str(required=True, dump_to="Zone"),
87+
}
88+
89+
90+
class CreateScanHotBigKeysResponseSchema(schema.ResponseSchema):
91+
"""CreateScanHotBigKeys - 创建执行扫大key和热key的任务"""
92+
93+
fields = {}
94+
95+
6996
"""
7097
API: CreateUMemBackup
7198
@@ -113,8 +140,10 @@ class CreateUMemSpaceRequestSchema(schema.RequestSchema):
113140
),
114141
"Name": fields.Str(required=True, dump_to="Name"),
115142
"Password": fields.Base64(required=False, dump_to="Password"),
143+
"Port": fields.Int(required=False, dump_to="Port"),
116144
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
117145
"Protocol": fields.Str(required=False, dump_to="Protocol"),
146+
"ProxyPort": fields.Int(required=False, dump_to="ProxyPort"),
118147
"ProxySize": fields.Int(required=False, dump_to="ProxySize"),
119148
"Quantity": fields.Int(required=False, dump_to="Quantity"),
120149
"Region": fields.Str(required=True, dump_to="Region"),
@@ -123,6 +152,7 @@ class CreateUMemSpaceRequestSchema(schema.RequestSchema):
123152
"SubnetId": fields.Str(required=False, dump_to="SubnetId"),
124153
"Tag": fields.Str(required=False, dump_to="Tag"),
125154
"Type": fields.Str(required=False, dump_to="Type"),
155+
"UlbMode": fields.Bool(required=False, dump_to="UlbMode"),
126156
"VPCId": fields.Str(required=False, dump_to="VPCId"),
127157
"Version": fields.Str(required=False, dump_to="Version"),
128158
"Zone": fields.Str(required=True, dump_to="Zone"),
@@ -212,6 +242,7 @@ class CreateURedisGroupRequestSchema(schema.RequestSchema):
212242
"""CreateURedisGroup - 创建主备redis"""
213243

214244
fields = {
245+
"AOFID": fields.Str(required=False, dump_to="AOFID"),
215246
"AutoBackup": fields.Str(required=False, dump_to="AutoBackup"),
216247
"BackupId": fields.Str(required=False, dump_to="BackupId"),
217248
"BackupTime": fields.Int(required=False, dump_to="BackupTime"),
@@ -228,9 +259,14 @@ class CreateURedisGroupRequestSchema(schema.RequestSchema):
228259
"MasterGroupId": fields.Str(required=False, dump_to="MasterGroupId"),
229260
"Name": fields.Str(required=True, dump_to="Name"),
230261
"Password": fields.Base64(required=False, dump_to="Password"),
262+
"Port": fields.Int(required=False, dump_to="Port"),
231263
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
232264
"Quantity": fields.Int(required=False, dump_to="Quantity"),
233265
"Region": fields.Str(required=True, dump_to="Region"),
266+
"RollbackGroupId": fields.Str(
267+
required=False, dump_to="RollbackGroupId"
268+
),
269+
"RollbackTime": fields.Int(required=False, dump_to="RollbackTime"),
234270
"Size": fields.Int(required=False, dump_to="Size"),
235271
"SlaveZone": fields.Str(required=False, dump_to="SlaveZone"),
236272
"SubnetId": fields.Str(required=False, dump_to="SubnetId"),
@@ -524,6 +560,7 @@ class DescribeUMemPriceRequestSchema(schema.RequestSchema):
524560
"Region": fields.Str(required=True, dump_to="Region"),
525561
"Size": fields.Int(required=True, dump_to="Size"),
526562
"Type": fields.Str(required=True, dump_to="Type"),
563+
"UlbMode": fields.Str(required=False, dump_to="UlbMode"),
527564
"Zone": fields.Str(required=True, dump_to="Zone"),
528565
}
529566

@@ -581,7 +618,15 @@ class DescribeUMemUpgradePriceRequestSchema(schema.RequestSchema):
581618
"""DescribeUMemUpgradePrice - 获取UMem升级价格信息"""
582619

583620
fields = {
621+
"BlockIds": fields.List(fields.Str()),
622+
"BlockSize": fields.List(fields.Int()),
623+
"HighPerformance": fields.Str(
624+
required=False, dump_to="HighPerformance"
625+
),
626+
"IsSplit": fields.Str(required=False, dump_to="IsSplit"),
627+
"NewCPU": fields.Int(required=False, dump_to="NewCPU"),
584628
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
629+
"ProxyId": fields.Str(required=False, dump_to="ProxyId"),
585630
"Region": fields.Str(required=True, dump_to="Region"),
586631
"Size": fields.Int(required=True, dump_to="Size"),
587632
"SpaceId": fields.Str(required=True, dump_to="SpaceId"),
@@ -893,6 +938,10 @@ class DescribeURedisUpgradePriceRequestSchema(schema.RequestSchema):
893938

894939
fields = {
895940
"GroupId": fields.Str(required=True, dump_to="GroupId"),
941+
"HighPerformance": fields.Bool(
942+
required=False, dump_to="HighPerformance"
943+
),
944+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
896945
"Region": fields.Str(required=True, dump_to="Region"),
897946
"Size": fields.Int(required=True, dump_to="Size"),
898947
"Zone": fields.Str(required=False, dump_to="Zone"),
@@ -903,6 +952,7 @@ class DescribeURedisUpgradePriceResponseSchema(schema.ResponseSchema):
903952
"""DescribeURedisUpgradePrice - 获取uredis升级价格信息"""
904953

905954
fields = {
955+
"OriginalPrice": fields.Int(required=False, load_from="OriginalPrice"),
906956
"Price": fields.Float(required=False, load_from="Price"),
907957
}
908958

@@ -1186,11 +1236,15 @@ class ResizeURedisGroupRequestSchema(schema.RequestSchema):
11861236
"ChargeType": fields.Str(required=False, dump_to="ChargeType"),
11871237
"CouponId": fields.Int(required=False, dump_to="CouponId"),
11881238
"GroupId": fields.Str(required=True, dump_to="GroupId"),
1239+
"HighPerformance": fields.Bool(
1240+
required=False, dump_to="HighPerformance"
1241+
),
11891242
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
11901243
"Region": fields.Str(required=True, dump_to="Region"),
11911244
"Size": fields.Int(required=True, dump_to="Size"),
1245+
"StartTime": fields.Int(required=False, dump_to="StartTime"),
11921246
"Type": fields.Str(required=False, dump_to="Type"),
1193-
"Zone": fields.Str(required=False, dump_to="Zone"),
1247+
"Zone": fields.Str(required=True, dump_to="Zone"),
11941248
}
11951249

11961250

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/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.11.56"
1+
version = "0.11.57"

0 commit comments

Comments
 (0)