Skip to content

Commit 31b90be

Browse files
authored
sdk: rolling update for 0.11.37 (#236)
1 parent d74e2cc commit 31b90be

File tree

23 files changed

+751
-200
lines changed

23 files changed

+751
-200
lines changed

docs/services.rst

+7
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@ UPhone
192192
:members:
193193

194194

195+
USLK
196+
----
197+
198+
.. autoclass:: ucloud.services.uslk.client.USLKClient
199+
:members:
200+
201+
195202
UTSDB
196203
-----
197204

ucloud/client.py

+10
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,16 @@ def uphone(self):
282282
self.logger,
283283
)
284284

285+
def uslk(self):
286+
from ucloud.services.uslk.client import USLKClient
287+
288+
return USLKClient(
289+
self._auto_config("uslk"),
290+
self.transport,
291+
self.middleware,
292+
self.logger,
293+
)
294+
285295
def usms(self):
286296
from ucloud.services.usms.client import USMSClient
287297

ucloud/services/pathx/schemas/models.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,6 @@ class SrcAreaInfoSchema(schema.ResponseSchema):
116116
}
117117

118118

119-
class OutPublicIpInfoSchema(schema.ResponseSchema):
120-
"""OutPublicIpInfo - 线路回源IP信息"""
121-
122-
fields = {
123-
"Area": fields.Str(required=False, load_from="Area"),
124-
"IP": fields.Str(required=False, load_from="IP"),
125-
}
126-
127-
128119
class ForwardTaskSchema(schema.ResponseSchema):
129120
"""ForwardTask - 全球统一接入转发端口任务信息"""
130121

@@ -135,6 +126,15 @@ class ForwardTaskSchema(schema.ResponseSchema):
135126
}
136127

137128

129+
class OutPublicIpInfoSchema(schema.ResponseSchema):
130+
"""OutPublicIpInfo - 线路回源IP信息"""
131+
132+
fields = {
133+
"Area": fields.Str(required=False, load_from="Area"),
134+
"IP": fields.Str(required=False, load_from="IP"),
135+
}
136+
137+
138138
class AccelerationAreaInfosSchema(schema.ResponseSchema):
139139
"""AccelerationAreaInfos - 加速大区信息"""
140140

ucloud/services/ucdn/client.py

+13-10
Original file line numberDiff line numberDiff line change
@@ -1009,15 +1009,15 @@ def get_ucdn_domain_info_list(
10091009
def get_ucdn_domain_log(
10101010
self, req: typing.Optional[dict] = None, **kwargs
10111011
) -> dict:
1012-
"""GetUcdnDomainLog - 获取加速域名原始日志
1012+
"""GetUcdnDomainLog -
10131013
10141014
**Request**
10151015
1016-
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
1017-
- **BeginTime** (int) - 查询的起始时间,格式为Unix Timestamp。如果有EndTime,BeginTime必须赋值。
1018-
- **DomainId** (list) - 域名ID,创建加速域名时生成。默认全部域名
1019-
- **EndTime** (int) - 查询的结束时间,格式为Unix Timestamp。EndTime默认为当前时间,BeginTime默认为当前时间前一天时间。
1020-
- **Type** (int) - 查询粒度 0=default(没有粒度) 1=按小时 2=按天
1016+
- **ProjectId** (str) - (Config)
1017+
- **BeginTime** (int) -
1018+
- **DomainId** (list) -
1019+
- **EndTime** (int) -
1020+
- **Type** (int) -
10211021
10221022
**Response**
10231023
@@ -1026,14 +1026,14 @@ def get_ucdn_domain_log(
10261026
**Response Model**
10271027
10281028
**LogSetList**
1029-
- **Domain** (str) - 域名
1029+
- **Domain** (str) -
10301030
- **Logs** (list) - 见 **LogSetInfo** 模型定义
10311031
10321032
10331033
**LogSetInfo**
1034-
- **AbroadLog** (list) - 国外日志url列表
1035-
- **CnLog** (list) - 国内日志url列表
1036-
- **Time** (int) - 日志时间UnixTime
1034+
- **AbroadLog** (list) -
1035+
- **CnLog** (list) -
1036+
- **Time** (int) -
10371037
10381038
10391039
"""
@@ -1044,6 +1044,9 @@ def get_ucdn_domain_log(
10441044
req and d.update(req)
10451045
d = apis.GetUcdnDomainLogRequestSchema().dumps(d)
10461046

1047+
# build options
1048+
kwargs["max_retries"] = 0 # ignore retry when api is not idempotent
1049+
10471050
resp = self.invoke("GetUcdnDomainLog", d, **kwargs)
10481051
return apis.GetUcdnDomainLogResponseSchema().loads(resp)
10491052

ucloud/services/ucdn/schemas/apis.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -648,12 +648,12 @@ class GetUcdnDomainInfoListResponseSchema(schema.ResponseSchema):
648648
"""
649649
API: GetUcdnDomainLog
650650
651-
获取加速域名原始日志
651+
652652
"""
653653

654654

655655
class GetUcdnDomainLogRequestSchema(schema.RequestSchema):
656-
"""GetUcdnDomainLog - 获取加速域名原始日志"""
656+
"""GetUcdnDomainLog -"""
657657

658658
fields = {
659659
"BeginTime": fields.Int(required=False, dump_to="BeginTime"),
@@ -665,7 +665,7 @@ class GetUcdnDomainLogRequestSchema(schema.RequestSchema):
665665

666666

667667
class GetUcdnDomainLogResponseSchema(schema.ResponseSchema):
668-
"""GetUcdnDomainLog - 获取加速域名原始日志"""
668+
"""GetUcdnDomainLog -"""
669669

670670
fields = {
671671
"LogSet": fields.List(

ucloud/services/ucdn/schemas/models.py

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

55

6+
class AccessConfSchema(schema.ResponseSchema):
7+
"""AccessConf - 访问控制"""
8+
9+
fields = {
10+
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
11+
}
12+
13+
614
class CacheConfSchema(schema.ResponseSchema):
715
"""CacheConf - 缓存配置"""
816

@@ -21,14 +29,6 @@ class CacheConfSchema(schema.ResponseSchema):
2129
}
2230

2331

24-
class AccessConfSchema(schema.ResponseSchema):
25-
"""AccessConf - 访问控制"""
26-
27-
fields = {
28-
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
29-
}
30-
31-
3232
class DomainInfoSchema(schema.ResponseSchema):
3333
"""DomainInfo - 域名配置"""
3434

@@ -287,6 +287,17 @@ class ReferConfSchema(schema.ResponseSchema):
287287
}
288288

289289

290+
class CacheAllConfigSchema(schema.ResponseSchema):
291+
"""CacheAllConfig - 缓存相关的配置"""
292+
293+
fields = {
294+
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
295+
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
296+
"CacheList": fields.List(CacheConfSchema()),
297+
"HttpCodeCacheList": fields.List(CacheConfSchema()),
298+
}
299+
300+
290301
class OriginConfSchema(schema.ResponseSchema):
291302
"""OriginConf - 回源配置"""
292303

@@ -326,17 +337,6 @@ class AdvancedConfSchema(schema.ResponseSchema):
326337
}
327338

328339

329-
class CacheAllConfigSchema(schema.ResponseSchema):
330-
"""CacheAllConfig - 缓存相关的配置"""
331-
332-
fields = {
333-
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
334-
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
335-
"CacheList": fields.List(CacheConfSchema()),
336-
"HttpCodeCacheList": fields.List(CacheConfSchema()),
337-
}
338-
339-
340340
class AccessControlConfSchema(schema.ResponseSchema):
341341
"""AccessControlConf - 访问控制配置参数"""
342342

@@ -408,7 +408,7 @@ class DomainBaseInfoSchema(schema.ResponseSchema):
408408

409409

410410
class LogSetInfoSchema(schema.ResponseSchema):
411-
"""LogSetInfo - 日志信息"""
411+
"""LogSetInfo -"""
412412

413413
fields = {
414414
"AbroadLog": fields.List(fields.Str()),
@@ -418,7 +418,7 @@ class LogSetInfoSchema(schema.ResponseSchema):
418418

419419

420420
class LogSetListSchema(schema.ResponseSchema):
421-
"""LogSetList - 日志信息列表"""
421+
"""LogSetList -"""
422422

423423
fields = {
424424
"Domain": fields.Str(required=False, load_from="Domain"),

ucloud/services/udb/schemas/models.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ class UDBBackupSetSchema(schema.ResponseSchema):
2424
}
2525

2626

27+
class UFileDataSetSchema(schema.ResponseSchema):
28+
"""UFileDataSet - 增加ufile的描述"""
29+
30+
fields = {
31+
"Bucket": fields.Str(required=False, load_from="Bucket"),
32+
"TokenID": fields.Str(required=False, load_from="TokenID"),
33+
}
34+
35+
2736
class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
2837
"""UDBSlaveInstanceSet - DescribeUDBSlaveInstance"""
2938

@@ -78,15 +87,6 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
7887
}
7988

8089

81-
class UFileDataSetSchema(schema.ResponseSchema):
82-
"""UFileDataSet - 增加ufile的描述"""
83-
84-
fields = {
85-
"Bucket": fields.Str(required=False, load_from="Bucket"),
86-
"TokenID": fields.Str(required=False, load_from="TokenID"),
87-
}
88-
89-
9090
class UDBInstanceSetSchema(schema.ResponseSchema):
9191
"""UDBInstanceSet - DescribeUDBInstance"""
9292

ucloud/services/uec/schemas/models.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,6 @@ class CfgDictListSchema(schema.ResponseSchema):
6969
}
7070

7171

72-
class IpListSchema(schema.ResponseSchema):
73-
"""IpList - 容器组外网ip列表"""
74-
75-
fields = {
76-
"Ip": fields.Str(required=False, load_from="Ip"),
77-
"Isp": fields.Str(required=False, load_from="Isp"),
78-
}
79-
80-
81-
class ImageListSchema(schema.ResponseSchema):
82-
"""ImageList - 容器组镜像密钥列表"""
83-
84-
fields = {
85-
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
86-
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
87-
"UserName": fields.Str(required=False, load_from="UserName"),
88-
}
89-
90-
9172
class DockerInfoSchema(schema.ResponseSchema):
9273
"""DockerInfo - 容器信息"""
9374

@@ -116,6 +97,25 @@ class StorVolumeInfoSchema(schema.ResponseSchema):
11697
}
11798

11899

100+
class IpListSchema(schema.ResponseSchema):
101+
"""IpList - 容器组外网ip列表"""
102+
103+
fields = {
104+
"Ip": fields.Str(required=False, load_from="Ip"),
105+
"Isp": fields.Str(required=False, load_from="Isp"),
106+
}
107+
108+
109+
class ImageListSchema(schema.ResponseSchema):
110+
"""ImageList - 容器组镜像密钥列表"""
111+
112+
fields = {
113+
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
114+
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
115+
"UserName": fields.Str(required=False, load_from="UserName"),
116+
}
117+
118+
119119
class HolderListSchema(schema.ResponseSchema):
120120
"""HolderList - 容器组信息"""
121121

0 commit comments

Comments
 (0)