Skip to content

Commit ba489f9

Browse files
authored
sdk: rolling update for 0.11.50 (#254)
1 parent 8a25042 commit ba489f9

File tree

16 files changed

+194
-192
lines changed

16 files changed

+194
-192
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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,21 @@ class UGAATaskSchema(schema.ResponseSchema):
240240
}
241241

242242

243+
class UPathSetSchema(schema.ResponseSchema):
244+
"""UPathSet - uga关联的upath信息"""
245+
246+
fields = {
247+
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
248+
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
249+
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
250+
"LineId": fields.Str(required=False, load_from="LineId"),
251+
"LineTo": fields.Str(required=False, load_from="LineTo"),
252+
"LineToName": fields.Str(required=False, load_from="LineToName"),
253+
"UPathId": fields.Str(required=False, load_from="UPathId"),
254+
"UPathName": fields.Str(required=False, load_from="UPathName"),
255+
}
256+
257+
243258
class UGAL7ForwarderSchema(schema.ResponseSchema):
244259
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
245260

@@ -262,21 +277,6 @@ class UGAL4ForwarderSchema(schema.ResponseSchema):
262277
}
263278

264279

265-
class UPathSetSchema(schema.ResponseSchema):
266-
"""UPathSet - uga关联的upath信息"""
267-
268-
fields = {
269-
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
270-
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
271-
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
272-
"LineId": fields.Str(required=False, load_from="LineId"),
273-
"LineTo": fields.Str(required=False, load_from="LineTo"),
274-
"LineToName": fields.Str(required=False, load_from="LineToName"),
275-
"UPathId": fields.Str(required=False, load_from="UPathId"),
276-
"UPathName": fields.Str(required=False, load_from="UPathName"),
277-
}
278-
279-
280280
class UGAAInfoSchema(schema.ResponseSchema):
281281
"""UGAAInfo - 全球加速实例信息"""
282282

ucloud/services/uads/schemas/models.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ class ServiceInfoSchema(schema.ResponseSchema):
8383
}
8484

8585

86-
class EIPAddrSetSchema(schema.ResponseSchema):
87-
"""EIPAddrSet - EIP地址信息"""
88-
89-
fields = {
90-
"EIPType": fields.Str(required=False, load_from="EIPType"),
91-
"IP": fields.Str(required=False, load_from="IP"),
92-
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
93-
}
94-
95-
9686
class ResouceSchema(schema.ResponseSchema):
9787
"""Resouce - 资源信息"""
9888

@@ -105,6 +95,16 @@ class ResouceSchema(schema.ResponseSchema):
10595
}
10696

10797

98+
class EIPAddrSetSchema(schema.ResponseSchema):
99+
"""EIPAddrSet - EIP地址信息"""
100+
101+
fields = {
102+
"EIPType": fields.Str(required=False, load_from="EIPType"),
103+
"IP": fields.Str(required=False, load_from="IP"),
104+
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
105+
}
106+
107+
108108
class IPInfoSchema(schema.ResponseSchema):
109109
"""IPInfo - 高防IP信息"""
110110

ucloud/services/ubill/client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def list_u_bill_detail(
130130
- **AzGroupCName** (str) - 可用区
131131
- **ChargeType** (str) - 计费方式 (筛选项, 默认全部)。枚举值:\\ > Year:按年\\ > Month:按月 \\ > Day:按天 \\ > Dynamic:按时 \\ > Used:按量 \\ > Donate:赠送 \\ > Trial:试用 \\ > Post:后付费 \\ > Spot:抢占式
132132
- **CreateTime** (int) - 创建时间(时间戳)
133+
- **EndTime** (int) - 结束时间(时间戳)
133134
- **ItemDetails** (list) - 见 **ItemDetail** 模型定义
134135
- **OrderNo** (str) - 订单号
135136
- **OrderType** (str) - 订单类型 (筛选项, 默认全部) 。枚举值:\\ > OT_BUY:新购 \\ > OT_RENEW:续费 \\ > OT_UPGRADE:升级 \\ > OT_DOWNGRADE:降级 \\ > OT_SUSPEND:结算 \\ > OT_ADDITIONAL:补单 \\ > OT_REFUND:删除 \\ > OT_POSTPAID_RENEW:过期 \\ > OT_POSTPAID_PAYMENT:后付费 \\ > OT_RECOVER:删除恢复

ucloud/services/ubill/schemas/models.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ class AccountInfoSchema(schema.ResponseSchema):
1717
}
1818

1919

20-
class ResourceExtendInfoSchema(schema.ResponseSchema):
21-
"""ResourceExtendInfo - 资源标识"""
20+
class ItemDetailSchema(schema.ResponseSchema):
21+
"""ItemDetail - 产品配置"""
2222

2323
fields = {
24-
"KeyId": fields.Str(required=True, load_from="KeyId"),
24+
"ProductName": fields.Str(required=True, load_from="ProductName"),
2525
"Value": fields.Str(required=True, load_from="Value"),
2626
}
2727

2828

29-
class ItemDetailSchema(schema.ResponseSchema):
30-
"""ItemDetail - 产品配置"""
29+
class ResourceExtendInfoSchema(schema.ResponseSchema):
30+
"""ResourceExtendInfo - 资源标识"""
3131

3232
fields = {
33-
"ProductName": fields.Str(required=True, load_from="ProductName"),
33+
"KeyId": fields.Str(required=True, load_from="KeyId"),
3434
"Value": fields.Str(required=True, load_from="Value"),
3535
}
3636

@@ -47,6 +47,7 @@ class BillDetailItemSchema(schema.ResponseSchema):
4747
"AzGroupCName": fields.Str(required=True, load_from="AzGroupCName"),
4848
"ChargeType": fields.Str(required=True, load_from="ChargeType"),
4949
"CreateTime": fields.Int(required=True, load_from="CreateTime"),
50+
"EndTime": fields.Int(required=True, load_from="EndTime"),
5051
"ItemDetails": fields.List(ItemDetailSchema()),
5152
"OrderNo": fields.Str(required=True, load_from="OrderNo"),
5253
"OrderType": fields.Str(required=True, load_from="OrderType"),

ucloud/services/ucdn/schemas/models.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,16 @@ class BandwidthTrafficInfoSchema(schema.ResponseSchema):
294294
}
295295

296296

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+
297307
class CacheKeyInfoSchema(schema.ResponseSchema):
298308
"""CacheKeyInfo - 忽略参数缓存配置"""
299309

@@ -304,13 +314,12 @@ class CacheKeyInfoSchema(schema.ResponseSchema):
304314
}
305315

306316

307-
class ReferConfSchema(schema.ResponseSchema):
308-
"""ReferConf - refer配置"""
317+
class AccessControlConfSchema(schema.ResponseSchema):
318+
"""AccessControlConf - 访问控制配置参数"""
309319

310320
fields = {
311-
"NullRefer": fields.Int(required=False, load_from="NullRefer"),
312-
"ReferList": fields.List(fields.Str()),
313-
"ReferType": fields.Int(required=False, load_from="ReferType"),
321+
"IpBlackList": fields.List(fields.Str()),
322+
"ReferConf": ReferConfSchema(),
314323
}
315324

316325

@@ -368,15 +377,6 @@ class AdvancedConfSchema(schema.ResponseSchema):
368377
}
369378

370379

371-
class AccessControlConfSchema(schema.ResponseSchema):
372-
"""AccessControlConf - 访问控制配置参数"""
373-
374-
fields = {
375-
"IpBlackList": fields.List(fields.Str()),
376-
"ReferConf": ReferConfSchema(),
377-
}
378-
379-
380380
class DomainConfigInfoSchema(schema.ResponseSchema):
381381
"""DomainConfigInfo - 更新域名配置"""
382382

ucloud/services/ucompshare/schemas/models.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@ class BundleSchema(schema.ResponseSchema):
1616
}
1717

1818

19-
class ULHostDiskSetSchema(schema.ResponseSchema):
20-
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""
21-
22-
fields = {
23-
"DiskId": fields.Str(required=False, load_from="DiskId"),
24-
"DiskType": fields.Str(required=False, load_from="DiskType"),
25-
"Drive": fields.Str(required=False, load_from="Drive"),
26-
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
27-
"Size": fields.Int(required=False, load_from="Size"),
28-
"Type": fields.Str(required=False, load_from="Type"),
29-
}
30-
31-
3219
class UHostIPSetSchema(schema.ResponseSchema):
3320
"""UHostIPSet -"""
3421

@@ -49,6 +36,19 @@ class UHostIPSetSchema(schema.ResponseSchema):
4936
}
5037

5138

39+
class ULHostDiskSetSchema(schema.ResponseSchema):
40+
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""
41+
42+
fields = {
43+
"DiskId": fields.Str(required=False, load_from="DiskId"),
44+
"DiskType": fields.Str(required=False, load_from="DiskType"),
45+
"Drive": fields.Str(required=False, load_from="Drive"),
46+
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
47+
"Size": fields.Int(required=False, load_from="Size"),
48+
"Type": fields.Str(required=False, load_from="Type"),
49+
}
50+
51+
5252
class ULHostInstanceSetSchema(schema.ResponseSchema):
5353
"""ULHostInstanceSet - 轻量应用云主机详情"""
5454

ucloud/services/udb/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ def clear_udb_log(
223223
224224
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
225225
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
226+
- **BeforeTime** (int) - (Required) 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天
226227
- **DBId** (str) - (Required) DB实例的id,该值可以通过DescribeUDBInstance获取
227228
- **LogType** (int) - (Required) 日志类型,10-error(暂不支持)、20-slow(暂不支持 )、30-binlog
228-
- **BeforeTime** (int) - 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天
229229
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
230230
231231
**Response**

ucloud/services/udb/schemas/apis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ClearUDBLogRequestSchema(schema.RequestSchema):
201201
"""ClearUDBLog - 清除UDB实例的log"""
202202

203203
fields = {
204-
"BeforeTime": fields.Int(required=False, dump_to="BeforeTime"),
204+
"BeforeTime": fields.Int(required=True, dump_to="BeforeTime"),
205205
"DBId": fields.Str(required=True, dump_to="DBId"),
206206
"LogType": fields.Int(required=True, dump_to="LogType"),
207207
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),

ucloud/services/uec/schemas/models.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,6 @@ class ResourceInfoSchema(schema.ResponseSchema):
5050
}
5151

5252

53-
class CfgDictListSchema(schema.ResponseSchema):
54-
"""CfgDictList - 容器配置字典列表"""
55-
56-
fields = {
57-
"MountPath": fields.Str(required=False, load_from="MountPath"),
58-
"Name": fields.Str(required=False, load_from="Name"),
59-
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
60-
}
61-
62-
6353
class EnvListSchema(schema.ResponseSchema):
6454
"""EnvList - 容器环境变量列表"""
6555

@@ -69,12 +59,13 @@ class EnvListSchema(schema.ResponseSchema):
6959
}
7060

7161

72-
class IpListSchema(schema.ResponseSchema):
73-
"""IpList - 容器组外网ip列表"""
62+
class CfgDictListSchema(schema.ResponseSchema):
63+
"""CfgDictList - 容器配置字典列表"""
7464

7565
fields = {
76-
"Ip": fields.Str(required=False, load_from="Ip"),
77-
"Isp": fields.Str(required=False, load_from="Isp"),
66+
"MountPath": fields.Str(required=False, load_from="MountPath"),
67+
"Name": fields.Str(required=False, load_from="Name"),
68+
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
7869
}
7970

8071

@@ -95,6 +86,15 @@ class DockerInfoSchema(schema.ResponseSchema):
9586
}
9687

9788

89+
class IpListSchema(schema.ResponseSchema):
90+
"""IpList - 容器组外网ip列表"""
91+
92+
fields = {
93+
"Ip": fields.Str(required=False, load_from="Ip"),
94+
"Isp": fields.Str(required=False, load_from="Isp"),
95+
}
96+
97+
9898
class ImageListSchema(schema.ResponseSchema):
9999
"""ImageList - 容器组镜像密钥列表"""
100100

0 commit comments

Comments
 (0)