Skip to content

Commit 6ead98f

Browse files
authored
sdk: rolling update for 0.11.39 (#238)
1 parent 7dd584a commit 6ead98f

File tree

15 files changed

+337
-235
lines changed

15 files changed

+337
-235
lines changed

ucloud/services/ipsecvpn/schemas/models.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,30 @@ class VPNGatewayDataSetSchema(schema.ResponseSchema):
4949
}
5050

5151

52+
class IKEDataSchema(schema.ResponseSchema):
53+
"""IKEData - IKE信息"""
54+
55+
fields = {
56+
"IKEAuthenticationAlgorithm": fields.Str(
57+
required=False, load_from="IKEAuthenticationAlgorithm"
58+
),
59+
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
60+
"IKEEncryptionAlgorithm": fields.Str(
61+
required=False, load_from="IKEEncryptionAlgorithm"
62+
),
63+
"IKEExchangeMode": fields.Str(
64+
required=False, load_from="IKEExchangeMode"
65+
),
66+
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
67+
"IKEPreSharedKey": fields.Str(
68+
required=False, load_from="IKEPreSharedKey"
69+
),
70+
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
71+
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
72+
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
73+
}
74+
75+
5276
class IPSecDataSchema(schema.ResponseSchema):
5377
"""IPSecData - IPSec参数"""
5478

@@ -74,30 +98,6 @@ class IPSecDataSchema(schema.ResponseSchema):
7498
}
7599

76100

77-
class IKEDataSchema(schema.ResponseSchema):
78-
"""IKEData - IKE信息"""
79-
80-
fields = {
81-
"IKEAuthenticationAlgorithm": fields.Str(
82-
required=False, load_from="IKEAuthenticationAlgorithm"
83-
),
84-
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
85-
"IKEEncryptionAlgorithm": fields.Str(
86-
required=False, load_from="IKEEncryptionAlgorithm"
87-
),
88-
"IKEExchangeMode": fields.Str(
89-
required=False, load_from="IKEExchangeMode"
90-
),
91-
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
92-
"IKEPreSharedKey": fields.Str(
93-
required=False, load_from="IKEPreSharedKey"
94-
),
95-
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
96-
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
97-
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
98-
}
99-
100-
101101
class VPNTunnelDataSetSchema(schema.ResponseSchema):
102102
"""VPNTunnelDataSet - DescribeVPNTunnel信息"""
103103

ucloud/services/pathx/schemas/models.py

Lines changed: 24 additions & 24 deletions
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

@@ -146,6 +137,15 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
146137
}
147138

148139

140+
class OutPublicIpInfoSchema(schema.ResponseSchema):
141+
"""OutPublicIpInfo - 线路回源IP信息"""
142+
143+
fields = {
144+
"Area": fields.Str(required=False, load_from="Area"),
145+
"IP": fields.Str(required=False, load_from="IP"),
146+
}
147+
148+
149149
class ForwardInfoSchema(schema.ResponseSchema):
150150
"""ForwardInfo - 全球统一接入加速实例配置信息"""
151151

@@ -212,6 +212,21 @@ class AccelerationInfoSchema(schema.ResponseSchema):
212212
}
213213

214214

215+
class UPathSetSchema(schema.ResponseSchema):
216+
"""UPathSet - uga关联的upath信息"""
217+
218+
fields = {
219+
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
220+
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
221+
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
222+
"LineId": fields.Str(required=False, load_from="LineId"),
223+
"LineTo": fields.Str(required=False, load_from="LineTo"),
224+
"LineToName": fields.Str(required=False, load_from="LineToName"),
225+
"UPathId": fields.Str(required=False, load_from="UPathId"),
226+
"UPathName": fields.Str(required=False, load_from="UPathName"),
227+
}
228+
229+
215230
class UGAL7ForwarderSchema(schema.ResponseSchema):
216231
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
217232

@@ -243,21 +258,6 @@ class UGAATaskSchema(schema.ResponseSchema):
243258
}
244259

245260

246-
class UPathSetSchema(schema.ResponseSchema):
247-
"""UPathSet - uga关联的upath信息"""
248-
249-
fields = {
250-
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
251-
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
252-
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
253-
"LineId": fields.Str(required=False, load_from="LineId"),
254-
"LineTo": fields.Str(required=False, load_from="LineTo"),
255-
"LineToName": fields.Str(required=False, load_from="LineToName"),
256-
"UPathId": fields.Str(required=False, load_from="UPathId"),
257-
"UPathName": fields.Str(required=False, load_from="UPathName"),
258-
}
259-
260-
261261
class UGAAInfoSchema(schema.ResponseSchema):
262262
"""UGAAInfo - 全球加速实例信息"""
263263

ucloud/services/ucdn/client.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,51 @@ def describe_new_ucdn_refresh_cache_task(
292292
resp = self.invoke("DescribeNewUcdnRefreshCacheTask", d, **kwargs)
293293
return apis.DescribeNewUcdnRefreshCacheTaskResponseSchema().loads(resp)
294294

295+
def get_auth_config(
296+
self, req: typing.Optional[dict] = None, **kwargs
297+
) -> dict:
298+
"""GetAuthConfig - 接口获取鉴权信息(非标使用)
299+
300+
**Request**
301+
302+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
303+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
304+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
305+
- **Domain** (str) - 希望获取的域名,不传则获取所有
306+
307+
**Response**
308+
309+
- **AuthConfigs** (list) - 见 **KwaiDomainAuthConfig** 模型定义
310+
311+
**Response Model**
312+
313+
**KwaiAuthKv**
314+
- **Iv** (str) - iv信息
315+
- **Key** (str) - key信息
316+
317+
318+
**KwaiAuthConfig**
319+
- **Keys** (list) - 见 **KwaiAuthKv** 模型定义
320+
- **Type** (str) - 类型 pkey / ksc / typeA
321+
322+
323+
**KwaiDomainAuthConfig**
324+
- **Config** (list) - 见 **KwaiAuthConfig** 模型定义
325+
- **Domain** (str) - 域名
326+
327+
328+
"""
329+
# build request
330+
d = {
331+
"ProjectId": self.config.project_id,
332+
"Region": self.config.region,
333+
}
334+
req and d.update(req)
335+
d = apis.GetAuthConfigRequestSchema().dumps(d)
336+
337+
resp = self.invoke("GetAuthConfig", d, **kwargs)
338+
return apis.GetAuthConfigResponseSchema().loads(resp)
339+
295340
def get_certificate_v2(
296341
self, req: typing.Optional[dict] = None, **kwargs
297342
) -> dict:

ucloud/services/ucdn/schemas/apis.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,36 @@ class DescribeNewUcdnRefreshCacheTaskResponseSchema(schema.ResponseSchema):
206206
}
207207

208208

209+
"""
210+
API: GetAuthConfig
211+
212+
接口获取鉴权信息(非标使用)
213+
"""
214+
215+
216+
class GetAuthConfigRequestSchema(schema.RequestSchema):
217+
"""GetAuthConfig - 接口获取鉴权信息(非标使用)"""
218+
219+
fields = {
220+
"Domain": fields.Str(required=False, dump_to="Domain"),
221+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
222+
"Region": fields.Str(required=True, dump_to="Region"),
223+
"Zone": fields.Str(required=True, dump_to="Zone"),
224+
}
225+
226+
227+
class GetAuthConfigResponseSchema(schema.ResponseSchema):
228+
"""GetAuthConfig - 接口获取鉴权信息(非标使用)"""
229+
230+
fields = {
231+
"AuthConfigs": fields.List(
232+
models.KwaiDomainAuthConfigSchema(),
233+
required=False,
234+
load_from="AuthConfigs",
235+
),
236+
}
237+
238+
209239
"""
210240
API: GetCertificateV2
211241

ucloud/services/ucdn/schemas/models.py

Lines changed: 62 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,33 @@ class TaskInfoSchema(schema.ResponseSchema):
9191
}
9292

9393

94+
class KwaiAuthKvSchema(schema.ResponseSchema):
95+
"""KwaiAuthKv - 快手鉴权键值信息"""
96+
97+
fields = {
98+
"Iv": fields.Str(required=True, load_from="Iv"),
99+
"Key": fields.Str(required=True, load_from="Key"),
100+
}
101+
102+
103+
class KwaiAuthConfigSchema(schema.ResponseSchema):
104+
"""KwaiAuthConfig - 鉴权信息"""
105+
106+
fields = {
107+
"Keys": fields.List(KwaiAuthKvSchema()),
108+
"Type": fields.Str(required=True, load_from="Type"),
109+
}
110+
111+
112+
class KwaiDomainAuthConfigSchema(schema.ResponseSchema):
113+
"""KwaiDomainAuthConfig - 快手域名鉴权信息"""
114+
115+
fields = {
116+
"Config": fields.List(KwaiAuthConfigSchema()),
117+
"Domain": fields.Str(required=True, load_from="Domain"),
118+
}
119+
120+
94121
class CertListSchema(schema.ResponseSchema):
95122
"""CertList - 证书信息"""
96123

@@ -267,6 +294,16 @@ class BandwidthTrafficInfoSchema(schema.ResponseSchema):
267294
}
268295

269296

297+
class ReferConfSchema(schema.ResponseSchema):
298+
"""ReferConf - refer配置"""
299+
300+
fields = {
301+
"NullRefer": fields.Int(required=False, load_from="NullRefer"),
302+
"ReferList": fields.List(fields.Str()),
303+
"ReferType": fields.Int(required=False, load_from="ReferType"),
304+
}
305+
306+
270307
class CacheKeyInfoSchema(schema.ResponseSchema):
271308
"""CacheKeyInfo - 忽略参数缓存配置"""
272309

@@ -277,13 +314,33 @@ class CacheKeyInfoSchema(schema.ResponseSchema):
277314
}
278315

279316

280-
class ReferConfSchema(schema.ResponseSchema):
281-
"""ReferConf - refer配置"""
317+
class AdvancedConfSchema(schema.ResponseSchema):
318+
"""AdvancedConf - 域名高级配置"""
282319

283320
fields = {
284-
"NullRefer": fields.Int(required=False, load_from="NullRefer"),
285-
"ReferList": fields.List(fields.Str()),
286-
"ReferType": fields.Int(required=False, load_from="ReferType"),
321+
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
322+
"HttpClientHeader": fields.List(fields.Str()),
323+
"HttpOriginHeader": fields.List(fields.Str()),
324+
}
325+
326+
327+
class AccessControlConfSchema(schema.ResponseSchema):
328+
"""AccessControlConf - 访问控制配置参数"""
329+
330+
fields = {
331+
"IpBlackList": fields.List(fields.Str()),
332+
"ReferConf": ReferConfSchema(),
333+
}
334+
335+
336+
class CacheAllConfigSchema(schema.ResponseSchema):
337+
"""CacheAllConfig - 缓存相关的配置"""
338+
339+
fields = {
340+
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
341+
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
342+
"CacheList": fields.List(CacheConfSchema()),
343+
"HttpCodeCacheList": fields.List(CacheConfSchema()),
287344
}
288345

289346

@@ -316,36 +373,6 @@ class OriginConfSchema(schema.ResponseSchema):
316373
}
317374

318375

319-
class CacheAllConfigSchema(schema.ResponseSchema):
320-
"""CacheAllConfig - 缓存相关的配置"""
321-
322-
fields = {
323-
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
324-
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
325-
"CacheList": fields.List(CacheConfSchema()),
326-
"HttpCodeCacheList": fields.List(CacheConfSchema()),
327-
}
328-
329-
330-
class AdvancedConfSchema(schema.ResponseSchema):
331-
"""AdvancedConf - 域名高级配置"""
332-
333-
fields = {
334-
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
335-
"HttpClientHeader": fields.List(fields.Str()),
336-
"HttpOriginHeader": fields.List(fields.Str()),
337-
}
338-
339-
340-
class AccessControlConfSchema(schema.ResponseSchema):
341-
"""AccessControlConf - 访问控制配置参数"""
342-
343-
fields = {
344-
"IpBlackList": fields.List(fields.Str()),
345-
"ReferConf": ReferConfSchema(),
346-
}
347-
348-
349376
class DomainConfigInfoSchema(schema.ResponseSchema):
350377
"""DomainConfigInfo - 更新域名配置"""
351378

ucloud/services/uec/schemas/models.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,13 @@ class CfgDictListSchema(schema.ResponseSchema):
6969
}
7070

7171

72-
class IpListSchema(schema.ResponseSchema):
73-
"""IpList - 容器组外网ip列表"""
72+
class ImageListSchema(schema.ResponseSchema):
73+
"""ImageList - 容器组镜像密钥列表"""
7474

7575
fields = {
76-
"Ip": fields.Str(required=False, load_from="Ip"),
77-
"Isp": fields.Str(required=False, load_from="Isp"),
76+
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
77+
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
78+
"UserName": fields.Str(required=False, load_from="UserName"),
7879
}
7980

8081

@@ -95,13 +96,12 @@ class DockerInfoSchema(schema.ResponseSchema):
9596
}
9697

9798

98-
class ImageListSchema(schema.ResponseSchema):
99-
"""ImageList - 容器组镜像密钥列表"""
99+
class IpListSchema(schema.ResponseSchema):
100+
"""IpList - 容器组外网ip列表"""
100101

101102
fields = {
102-
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
103-
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
104-
"UserName": fields.Str(required=False, load_from="UserName"),
103+
"Ip": fields.Str(required=False, load_from="Ip"),
104+
"Isp": fields.Str(required=False, load_from="Isp"),
105105
}
106106

107107

0 commit comments

Comments
 (0)