Skip to content

Commit 7dd584a

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.38 (#237)
1 parent 31b90be commit 7dd584a

File tree

30 files changed

+892
-464
lines changed

30 files changed

+892
-464
lines changed

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

+24-24
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,6 @@ 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-
7652
class IPSecDataSchema(schema.ResponseSchema):
7753
"""IPSecData - IPSec参数"""
7854

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

10076

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

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

118118

119-
class ForwardTaskSchema(schema.ResponseSchema):
120-
"""ForwardTask - 全球统一接入转发端口任务信息"""
119+
class OutPublicIpInfoSchema(schema.ResponseSchema):
120+
"""OutPublicIpInfo - 线路回源IP信息"""
121121

122122
fields = {
123-
"Port": fields.Int(required=True, load_from="Port"),
124-
"Protocol": fields.Str(required=True, load_from="Protocol"),
125-
"RSPort": fields.Int(required=True, load_from="RSPort"),
123+
"Area": fields.Str(required=False, load_from="Area"),
124+
"IP": fields.Str(required=False, load_from="IP"),
126125
}
127126

128127

129-
class OutPublicIpInfoSchema(schema.ResponseSchema):
130-
"""OutPublicIpInfo - 线路回源IP信息"""
128+
class ForwardTaskSchema(schema.ResponseSchema):
129+
"""ForwardTask - 全球统一接入转发端口任务信息"""
131130

132131
fields = {
133-
"Area": fields.Str(required=False, load_from="Area"),
134-
"IP": fields.Str(required=False, load_from="IP"),
132+
"Port": fields.Int(required=True, load_from="Port"),
133+
"Protocol": fields.Str(required=True, load_from="Protocol"),
134+
"RSPort": fields.Int(required=True, load_from="RSPort"),
135135
}
136136

137137

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

214214

215-
class UPathSetSchema(schema.ResponseSchema):
216-
"""UPathSet - uga关联的upath信息"""
215+
class UGAL7ForwarderSchema(schema.ResponseSchema):
216+
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
217217

218218
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"),
219+
"Port": fields.Int(required=True, load_from="Port"),
220+
"Protocol": fields.Str(required=True, load_from="Protocol"),
221+
"RSPort": fields.Int(required=True, load_from="RSPort"),
222+
"SSLId": fields.Str(required=False, load_from="SSLId"),
223+
"SSLName": fields.Str(required=False, load_from="SSLName"),
227224
}
228225

229226

230-
class UGAATaskSchema(schema.ResponseSchema):
231-
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
227+
class UGAL4ForwarderSchema(schema.ResponseSchema):
228+
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
232229

233230
fields = {
234231
"Port": fields.Int(required=True, load_from="Port"),
235232
"Protocol": fields.Str(required=True, load_from="Protocol"),
233+
"RSPort": fields.Int(required=True, load_from="RSPort"),
236234
}
237235

238236

239-
class UGAL7ForwarderSchema(schema.ResponseSchema):
240-
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
237+
class UGAATaskSchema(schema.ResponseSchema):
238+
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
241239

242240
fields = {
243241
"Port": fields.Int(required=True, load_from="Port"),
244242
"Protocol": fields.Str(required=True, load_from="Protocol"),
245-
"RSPort": fields.Int(required=True, load_from="RSPort"),
246-
"SSLId": fields.Str(required=False, load_from="SSLId"),
247-
"SSLName": fields.Str(required=False, load_from="SSLName"),
248243
}
249244

250245

251-
class UGAL4ForwarderSchema(schema.ResponseSchema):
252-
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
246+
class UPathSetSchema(schema.ResponseSchema):
247+
"""UPathSet - uga关联的upath信息"""
253248

254249
fields = {
255-
"Port": fields.Int(required=True, load_from="Port"),
256-
"Protocol": fields.Str(required=True, load_from="Protocol"),
257-
"RSPort": fields.Int(required=True, load_from="RSPort"),
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"),
258258
}
259259

260260

‎ucloud/services/ubill/client.py

+57
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,30 @@ def __init__(
1313
):
1414
super(UBillClient, self).__init__(config, transport, middleware, logger)
1515

16+
def create_renew(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
17+
"""CreateRenew - 创建单个续费订单
18+
19+
**Request**
20+
21+
- **Quantity** (int) - (Required) 续费周期数[1~10]，按月计费资源可传值为0，表示续费到月底
22+
- **ResourceId** (str) - (Required) 需要续费资源ID
23+
24+
**Response**
25+
26+
- **OrderNo** (str) - 订单号
27+
28+
"""
29+
# build request
30+
d = {}
31+
req and d.update(req)
32+
d = apis.CreateRenewRequestSchema().dumps(d)
33+
34+
# build options
35+
kwargs["max_retries"] = 0 # ignore retry when api is not idempotent
36+
37+
resp = self.invoke("CreateRenew", d, **kwargs)
38+
return apis.CreateRenewResponseSchema().loads(resp)
39+
1640
def get_balance(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
1741
"""GetBalance - 获取账户余额
1842
@@ -184,3 +208,36 @@ def list_u_bill_overview(
184208

185209
resp = self.invoke("ListUBillOverview", d, **kwargs)
186210
return apis.ListUBillOverviewResponseSchema().loads(resp)
211+
212+
def modify_auto_renew_flag(
213+
self, req: typing.Optional[dict] = None, **kwargs
214+
) -> dict:
215+
"""ModifyAutoRenewFlag - 修改资源自动续费标识
216+
217+
**Request**
218+
219+
- **Flag** (str) - (Required) 开关标识(TURN_ON: 打开; TURN_OFF: 关闭)
220+
- **ResourceId** (str) - (Required) 资源ID
221+
222+
**Response**
223+
224+
- **Fail** (int) - 操作失败资源数量
225+
- **ResultSet** (list) - 见 **ResultSet** 模型定义
226+
- **Success** (int) - 操作成功资源数量
227+
228+
**Response Model**
229+
230+
**ResultSet**
231+
- **Message** (str) - 错误信息描述
232+
- **ResourceId** (str) - 资源ID
233+
- **RetCode** (int) - 续费结果(0:成功，失败返回错误码)
234+
235+
236+
"""
237+
# build request
238+
d = {}
239+
req and d.update(req)
240+
d = apis.ModifyAutoRenewFlagRequestSchema().dumps(d)
241+
242+
resp = self.invoke("ModifyAutoRenewFlag", d, **kwargs)
243+
return apis.ModifyAutoRenewFlagResponseSchema().loads(resp)

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

+52
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@
88
"""
99

1010

11+
"""
12+
API: CreateRenew
13+
14+
创建单个续费订单
15+
"""
16+
17+
18+
class CreateRenewRequestSchema(schema.RequestSchema):
19+
"""CreateRenew - 创建单个续费订单"""
20+
21+
fields = {
22+
"Quantity": fields.Int(required=True, dump_to="Quantity"),
23+
"ResourceId": fields.Str(required=True, dump_to="ResourceId"),
24+
}
25+
26+
27+
class CreateRenewResponseSchema(schema.ResponseSchema):
28+
"""CreateRenew - 创建单个续费订单"""
29+
30+
fields = {
31+
"OrderNo": fields.Str(required=True, load_from="OrderNo"),
32+
}
33+
34+
1135
"""
1236
API: GetBalance
1337
@@ -129,3 +153,31 @@ class ListUBillOverviewResponseSchema(schema.ResponseSchema):
129153
required=False, load_from="TotalUnpaidAmount"
130154
),
131155
}
156+
157+
158+
"""
159+
API: ModifyAutoRenewFlag
160+
161+
修改资源自动续费标识
162+
"""
163+
164+
165+
class ModifyAutoRenewFlagRequestSchema(schema.RequestSchema):
166+
"""ModifyAutoRenewFlag - 修改资源自动续费标识"""
167+
168+
fields = {
169+
"Flag": fields.Str(required=True, dump_to="Flag"),
170+
"ResourceId": fields.Str(required=True, dump_to="ResourceId"),
171+
}
172+
173+
174+
class ModifyAutoRenewFlagResponseSchema(schema.ResponseSchema):
175+
"""ModifyAutoRenewFlag - 修改资源自动续费标识"""
176+
177+
fields = {
178+
"Fail": fields.Int(required=True, load_from="Fail"),
179+
"ResultSet": fields.List(
180+
models.ResultSetSchema(), required=True, load_from="ResultSet"
181+
),
182+
"Success": fields.Int(required=True, load_from="Success"),
183+
}

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

+16-6
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ class AccountInfoSchema(schema.ResponseSchema):
1717
}
1818

1919

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

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

2828

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

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

@@ -91,3 +91,13 @@ class BillOverviewItemSchema(schema.ResponseSchema):
9191
"UserEmail": fields.Str(required=False, load_from="UserEmail"),
9292
"UserName": fields.Str(required=False, load_from="UserName"),
9393
}
94+
95+
96+
class ResultSetSchema(schema.ResponseSchema):
97+
"""ResultSet - 结果集"""
98+
99+
fields = {
100+
"Message": fields.Str(required=False, load_from="Message"),
101+
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
102+
"RetCode": fields.Int(required=False, load_from="RetCode"),
103+
}

‎ucloud/services/ucdn/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ def get_ucdn_domain_log_v2(
10751075
10761076
**LogInfo**
10771077
- **LogTime** (int) - Unix时间戳
1078-
- **LogUrl** (str) - 日志url地址
1078+
- **LogUrl** (str) - 日志url地址，多个URL用分号隔开
10791079
10801080
10811081
"""

0 commit comments

Comments
 (0)