Skip to content

Commit 7b96efd

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.66 (#272)
1 parent c6f6ef0 commit 7b96efd

File tree

10 files changed

+294
-140
lines changed

10 files changed

+294
-140
lines changed

‎ucloud/services/pathx/client.py

+72
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,49 @@ def get_global_ssh_price(
10251025
resp = self.invoke("GetGlobalSSHPrice", d, **kwargs)
10261026
return apis.GetGlobalSSHPriceResponseSchema().loads(resp)
10271027

1028+
def get_global_ssh_traffic(
1029+
self, req: typing.Optional[dict] = None, **kwargs
1030+
) -> dict:
1031+
"""GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据
1032+
1033+
**Request**
1034+
1035+
- **ProjectId** (str) - (Config) 项目ID,如org-xxxx。请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
1036+
- **BeginTime** (int) - (Required) 查询起始时间，如1525017600
1037+
- **EndTime** (int) - (Required) 查询结束时间，如1525103999
1038+
- **UGAId** (str) - (Required) 资源ID，如uga-as5daw
1039+
1040+
**Response**
1041+
1042+
- **DataSet** (list) - 见 **TrafficDaily** 模型定义
1043+
- **TrafficDailyRecently** (list) - 见 **TrafficDailyRecently** 模型定义
1044+
- **UGAId** (str) - 资源ID
1045+
1046+
**Response Model**
1047+
1048+
**TrafficDailyRecently**
1049+
- **Day** (str) - 日期
1050+
- **TrafficUnitGB** (str) - 日流量(单位GB)
1051+
- **TrafficUnitMB** (str) - 日流量(单位MB)
1052+
1053+
1054+
**TrafficDaily**
1055+
- **BillingState** (str) - Yes:已扣费, No:未扣费
1056+
- **Date** (int) - 日期
1057+
- **Traffic** (int) - 流量（单位GB）
1058+
1059+
1060+
"""
1061+
# build request
1062+
d = {
1063+
"ProjectId": self.config.project_id,
1064+
}
1065+
req and d.update(req)
1066+
d = apis.GetGlobalSSHTrafficRequestSchema().dumps(d)
1067+
1068+
resp = self.invoke("GetGlobalSSHTraffic", d, **kwargs)
1069+
return apis.GetGlobalSSHTrafficResponseSchema().loads(resp)
1070+
10281071
def get_global_ssh_update_price(
10291072
self, req: typing.Optional[dict] = None, **kwargs
10301073
) -> dict:
@@ -1224,6 +1267,35 @@ def get_uga_3update_price(
12241267
resp = self.invoke("GetUGA3UpdatePrice", d, **kwargs)
12251268
return apis.GetUGA3UpdatePriceResponseSchema().loads(resp)
12261269

1270+
def modify_global_ssh_origin_info(
1271+
self, req: typing.Optional[dict] = None, **kwargs
1272+
) -> dict:
1273+
"""ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息
1274+
1275+
**Request**
1276+
1277+
- **ProjectId** (str) - (Config) 项目ID,如org-xxxx。请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
1278+
- **InstanceId** (str) - (Required) 资源ID:ugaa-xxxxxxx
1279+
- **InstanceType** (str) - (Required) Free,Basic,Enterprise,Ultimate
1280+
- **RsIP** (str) - (Required) 被SSH访问的源站IP
1281+
- **Area** (str) - 填写支持SSH访问IP的地区名称，如“洛杉矶”，“新加坡”，“香港”，“东京”，“华盛顿”，“法兰克福”。Area和AreaCode两者必填一个
1282+
- **AreaCode** (str) - AreaCode, 区域航空港国际通用代码。Area和AreaCode两者必填一个
1283+
1284+
**Response**
1285+
1286+
- **Message** (str) - 提示信息
1287+
1288+
"""
1289+
# build request
1290+
d = {
1291+
"ProjectId": self.config.project_id,
1292+
}
1293+
req and d.update(req)
1294+
d = apis.ModifyGlobalSSHOriginInfoRequestSchema().dumps(d)
1295+
1296+
resp = self.invoke("ModifyGlobalSSHOriginInfo", d, **kwargs)
1297+
return apis.ModifyGlobalSSHOriginInfoResponseSchema().loads(resp)
1298+
12271299
def modify_global_ssh_port(
12281300
self, req: typing.Optional[dict] = None, **kwargs
12291301
) -> dict:

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

+62
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,40 @@ class GetGlobalSSHPriceResponseSchema(schema.ResponseSchema):
754754
}
755755

756756

757+
"""
758+
API: GetGlobalSSHTraffic
759+
760+
获取GlobalSSH流量统计数据
761+
"""
762+
763+
764+
class GetGlobalSSHTrafficRequestSchema(schema.RequestSchema):
765+
"""GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据"""
766+
767+
fields = {
768+
"BeginTime": fields.Int(required=True, dump_to="BeginTime"),
769+
"EndTime": fields.Int(required=True, dump_to="EndTime"),
770+
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
771+
"UGAId": fields.Str(required=True, dump_to="UGAId"),
772+
}
773+
774+
775+
class GetGlobalSSHTrafficResponseSchema(schema.ResponseSchema):
776+
"""GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据"""
777+
778+
fields = {
779+
"DataSet": fields.List(
780+
models.TrafficDailySchema(), required=True, load_from="DataSet"
781+
),
782+
"TrafficDailyRecently": fields.List(
783+
models.TrafficDailyRecentlySchema(),
784+
required=False,
785+
load_from="TrafficDailyRecently",
786+
),
787+
"UGAId": fields.Str(required=True, load_from="UGAId"),
788+
}
789+
790+
757791
"""
758792
API: GetGlobalSSHUpdatePrice
759793
@@ -900,6 +934,34 @@ class GetUGA3UpdatePriceResponseSchema(schema.ResponseSchema):
900934
}
901935

902936

937+
"""
938+
API: ModifyGlobalSSHOriginInfo
939+
940+
修改GlobalSSH 源站信息
941+
"""
942+
943+
944+
class ModifyGlobalSSHOriginInfoRequestSchema(schema.RequestSchema):
945+
"""ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息"""
946+
947+
fields = {
948+
"Area": fields.Str(required=False, dump_to="Area"),
949+
"AreaCode": fields.Str(required=False, dump_to="AreaCode"),
950+
"InstanceId": fields.Str(required=True, dump_to="InstanceId"),
951+
"InstanceType": fields.Str(required=True, dump_to="InstanceType"),
952+
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
953+
"RsIP": fields.Str(required=True, dump_to="RsIP"),
954+
}
955+
956+
957+
class ModifyGlobalSSHOriginInfoResponseSchema(schema.ResponseSchema):
958+
"""ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息"""
959+
960+
fields = {
961+
"Message": fields.Str(required=False, load_from="Message"),
962+
}
963+
964+
903965
"""
904966
API: ModifyGlobalSSHPort
905967

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

+38-18
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,15 @@ class SrcAreaInfoSchema(schema.ResponseSchema):
135135
}
136136

137137

138+
class OutPublicIpInfoSchema(schema.ResponseSchema):
139+
"""OutPublicIpInfo - 线路回源IP信息"""
140+
141+
fields = {
142+
"Area": fields.Str(required=False, load_from="Area"),
143+
"IP": fields.Str(required=False, load_from="IP"),
144+
}
145+
146+
138147
class AccelerationAreaInfosSchema(schema.ResponseSchema):
139148
"""AccelerationAreaInfos -"""
140149

@@ -146,15 +155,6 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
146155
}
147156

148157

149-
class OutPublicIpInfoSchema(schema.ResponseSchema):
150-
"""OutPublicIpInfo - 线路回源IP信息"""
151-
152-
fields = {
153-
"Area": fields.Str(required=False, load_from="Area"),
154-
"IP": fields.Str(required=False, load_from="IP"),
155-
}
156-
157-
158158
class ForwardTaskSchema(schema.ResponseSchema):
159159
"""ForwardTask -"""
160160

@@ -231,15 +231,6 @@ class AccelerationInfoSchema(schema.ResponseSchema):
231231
}
232232

233233

234-
class UGAATaskSchema(schema.ResponseSchema):
235-
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
236-
237-
fields = {
238-
"Port": fields.Int(required=True, load_from="Port"),
239-
"Protocol": fields.Str(required=True, load_from="Protocol"),
240-
}
241-
242-
243234
class UPathSetSchema(schema.ResponseSchema):
244235
"""UPathSet - uga关联的upath信息"""
245236

@@ -255,6 +246,15 @@ class UPathSetSchema(schema.ResponseSchema):
255246
}
256247

257248

249+
class UGAATaskSchema(schema.ResponseSchema):
250+
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
251+
252+
fields = {
253+
"Port": fields.Int(required=True, load_from="Port"),
254+
"Protocol": fields.Str(required=True, load_from="Protocol"),
255+
}
256+
257+
258258
class UGAL7ForwarderSchema(schema.ResponseSchema):
259259
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
260260

@@ -342,6 +342,26 @@ class AlarmRulerSchema(schema.ResponseSchema):
342342
}
343343

344344

345+
class TrafficDailyRecentlySchema(schema.ResponseSchema):
346+
"""TrafficDailyRecently - 最近3个月日流量统计"""
347+
348+
fields = {
349+
"Day": fields.Str(required=False, load_from="Day"),
350+
"TrafficUnitGB": fields.Str(required=False, load_from="TrafficUnitGB"),
351+
"TrafficUnitMB": fields.Str(required=False, load_from="TrafficUnitMB"),
352+
}
353+
354+
355+
class TrafficDailySchema(schema.ResponseSchema):
356+
"""TrafficDaily -"""
357+
358+
fields = {
359+
"BillingState": fields.Str(required=True, load_from="BillingState"),
360+
"Date": fields.Int(required=True, load_from="Date"),
361+
"Traffic": fields.Int(required=True, load_from="Traffic"),
362+
}
363+
364+
345365
class MatricPointSchema(schema.ResponseSchema):
346366
"""MatricPoint -"""
347367

‎ucloud/services/uaaa/client.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,16 @@ def describe_app_repo_permit_domain(
134134
135135
**Response Model**
136136
137-
**DomainInfo**
138-
- **Desc** (str) - 备注信息
139-
- **DomainName** (str) - 域名解析记录名称
140-
141-
142137
**DomainDetail**
143138
- **Info** (dict) - 见 **DomainInfo** 模型定义
144139
- **Redirect** (list) - 见 **DomainInfo** 模型定义
145140
146141
142+
**DomainInfo**
143+
- **Desc** (str) - 备注信息
144+
- **DomainName** (str) - 域名解析记录名称
145+
146+
147147
"""
148148
# build request
149149
d = {

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

+20-20
Original file line numberDiff line numberDiff line change
@@ -308,16 +308,6 @@ class BandwidthTrafficInfoSchema(schema.ResponseSchema):
308308
}
309309

310310

311-
class CacheKeyInfoSchema(schema.ResponseSchema):
312-
"""CacheKeyInfo - 忽略参数缓存配置"""
313-
314-
fields = {
315-
"Ignore": fields.Bool(required=False, load_from="Ignore"),
316-
"PathPattern": fields.Str(required=False, load_from="PathPattern"),
317-
"QueryString": fields.Str(required=False, load_from="QueryString"),
318-
}
319-
320-
321311
class ReferConfSchema(schema.ResponseSchema):
322312
"""ReferConf - refer配置"""
323313

@@ -328,14 +318,22 @@ class ReferConfSchema(schema.ResponseSchema):
328318
}
329319

330320

331-
class CacheAllConfigSchema(schema.ResponseSchema):
332-
"""CacheAllConfig - 缓存相关的配置"""
321+
class CacheKeyInfoSchema(schema.ResponseSchema):
322+
"""CacheKeyInfo - 忽略参数缓存配置"""
333323

334324
fields = {
335-
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
336-
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
337-
"CacheList": fields.List(CacheConfSchema()),
338-
"HttpCodeCacheList": fields.List(CacheConfSchema()),
325+
"Ignore": fields.Bool(required=False, load_from="Ignore"),
326+
"PathPattern": fields.Str(required=False, load_from="PathPattern"),
327+
"QueryString": fields.Str(required=False, load_from="QueryString"),
328+
}
329+
330+
331+
class AccessControlConfSchema(schema.ResponseSchema):
332+
"""AccessControlConf - 访问控制配置参数"""
333+
334+
fields = {
335+
"IpBlackList": fields.List(fields.Str()),
336+
"ReferConf": ReferConfSchema(),
339337
}
340338

341339

@@ -382,12 +380,14 @@ class AdvancedConfSchema(schema.ResponseSchema):
382380
}
383381

384382

385-
class AccessControlConfSchema(schema.ResponseSchema):
386-
"""AccessControlConf - 访问控制配置参数"""
383+
class CacheAllConfigSchema(schema.ResponseSchema):
384+
"""CacheAllConfig - 缓存相关的配置"""
387385

388386
fields = {
389-
"IpBlackList": fields.List(fields.Str()),
390-
"ReferConf": ReferConfSchema(),
387+
"CacheHost": fields.Str(required=False, load_from="CacheHost"),
388+
"CacheKeyList": fields.List(CacheKeyInfoSchema()),
389+
"CacheList": fields.List(CacheConfSchema()),
390+
"HttpCodeCacheList": fields.List(CacheConfSchema()),
391391
}
392392

393393

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

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

55

6+
class UFileDataSetSchema(schema.ResponseSchema):
7+
"""UFileDataSet - 增加ufile的描述"""
8+
9+
fields = {
10+
"Bucket": fields.Str(required=False, load_from="Bucket"),
11+
"TokenID": fields.Str(required=False, load_from="TokenID"),
12+
}
13+
14+
615
class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
716
"""UDBSlaveInstanceSet - DescribeUDBSlaveInstance"""
817

@@ -69,15 +78,6 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema):
6978
}
7079

7180

72-
class UFileDataSetSchema(schema.ResponseSchema):
73-
"""UFileDataSet - 增加ufile的描述"""
74-
75-
fields = {
76-
"Bucket": fields.Str(required=False, load_from="Bucket"),
77-
"TokenID": fields.Str(required=False, load_from="TokenID"),
78-
}
79-
80-
8181
class MongoDBShardedClusterSetSchema(schema.ResponseSchema):
8282
"""MongoDBShardedClusterSet -"""
8383

0 commit comments

Comments
 (0)