Skip to content

Commit 2b2f782

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.47 (#251)
1 parent 9055f2c commit 2b2f782

File tree

16 files changed

+269
-193
lines changed

16 files changed

+269
-193
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

+19-19
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,6 @@ 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-
147138
class AccelerationAreaInfosSchema(schema.ResponseSchema):
148139
"""AccelerationAreaInfos -"""
149140

@@ -165,6 +156,15 @@ class ForwardTaskSchema(schema.ResponseSchema):
165156
}
166157

167158

159+
class OutPublicIpInfoSchema(schema.ResponseSchema):
160+
"""OutPublicIpInfo - 线路回源IP信息"""
161+
162+
fields = {
163+
"Area": fields.Str(required=False, load_from="Area"),
164+
"IP": fields.Str(required=False, load_from="IP"),
165+
}
166+
167+
168168
class ForwardInfoSchema(schema.ResponseSchema):
169169
"""ForwardInfo -"""
170170

@@ -240,16 +240,6 @@ class UGAATaskSchema(schema.ResponseSchema):
240240
}
241241

242242

243-
class UGAL4ForwarderSchema(schema.ResponseSchema):
244-
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
245-
246-
fields = {
247-
"Port": fields.Int(required=True, load_from="Port"),
248-
"Protocol": fields.Str(required=True, load_from="Protocol"),
249-
"RSPort": fields.Int(required=True, load_from="RSPort"),
250-
}
251-
252-
253243
class UPathSetSchema(schema.ResponseSchema):
254244
"""UPathSet - uga关联的upath信息"""
255245

@@ -277,6 +267,16 @@ class UGAL7ForwarderSchema(schema.ResponseSchema):
277267
}
278268

279269

270+
class UGAL4ForwarderSchema(schema.ResponseSchema):
271+
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
272+
273+
fields = {
274+
"Port": fields.Int(required=True, load_from="Port"),
275+
"Protocol": fields.Str(required=True, load_from="Protocol"),
276+
"RSPort": fields.Int(required=True, load_from="RSPort"),
277+
}
278+
279+
280280
class UGAAInfoSchema(schema.ResponseSchema):
281281
"""UGAAInfo - 全球加速实例信息"""
282282

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

+8-8
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

‎ucloud/services/udi/client.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,12 @@ def describe_media_functions(
178178
179179
**Response Model**
180180
181-
**ParamCustom**
182-
- **Max** (int) -
183-
- **Min** (int) -
184-
- **ParamName** (str) -
185-
- **ParamType** (str) -
181+
**Function**
182+
- **DisplayName** (str) -
183+
- **FunctionName** (str) -
184+
- **InputType** (str) -
185+
- **OutputType** (str) -
186+
- **SupportParams** (list) - 见 **ParamOption** 模型定义
186187
187188
188189
**ParamOption**
@@ -193,12 +194,11 @@ def describe_media_functions(
193194
- **WhenValueCustom** (list) - 见 **ParamCustom** 模型定义
194195
195196
196-
**Function**
197-
- **DisplayName** (str) -
198-
- **FunctionName** (str) -
199-
- **InputType** (str) -
200-
- **OutputType** (str) -
201-
- **SupportParams** (list) - 见 **ParamOption** 模型定义
197+
**ParamCustom**
198+
- **Max** (int) -
199+
- **Min** (int) -
200+
- **ParamName** (str) -
201+
- **ParamType** (str) -
202202
203203
204204
"""

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,17 @@ class IpListSchema(schema.ResponseSchema):
7878
}
7979

8080

81+
class StorVolumeInfoSchema(schema.ResponseSchema):
82+
"""StorVolumeInfo - 容器组存储卷信息"""
83+
84+
fields = {
85+
"DiskSize": fields.Int(required=False, load_from="DiskSize"),
86+
"MountPoint": fields.Str(required=False, load_from="MountPoint"),
87+
"Name": fields.Str(required=False, load_from="Name"),
88+
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
89+
}
90+
91+
8192
class DockerInfoSchema(schema.ResponseSchema):
8293
"""DockerInfo - 容器信息"""
8394

@@ -105,17 +116,6 @@ class ImageListSchema(schema.ResponseSchema):
105116
}
106117

107118

108-
class StorVolumeInfoSchema(schema.ResponseSchema):
109-
"""StorVolumeInfo - 容器组存储卷信息"""
110-
111-
fields = {
112-
"DiskSize": fields.Int(required=False, load_from="DiskSize"),
113-
"MountPoint": fields.Str(required=False, load_from="MountPoint"),
114-
"Name": fields.Str(required=False, load_from="Name"),
115-
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
116-
}
117-
118-
119119
class HolderListSchema(schema.ResponseSchema):
120120
"""HolderList - 容器组信息"""
121121

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -65,33 +65,33 @@ class LifeCycleItemSchema(schema.ResponseSchema):
6565
}
6666

6767

68-
class UFileDailyReportItemSchema(schema.ResponseSchema):
69-
"""UFileDailyReportItem -"""
68+
class UFileTotalReportItemSchema(schema.ResponseSchema):
69+
"""UFileTotalReportItem - 总消费信息"""
7070

7171
fields = {
72-
"AcRestore": fields.Float(required=False, load_from="AcRestore"),
73-
"AcStorage": fields.Float(required=False, load_from="AcStorage"),
7472
"ApiTimes": fields.Float(required=False, load_from="ApiTimes"),
7573
"BusyFlow": fields.Float(required=False, load_from="BusyFlow"),
7674
"CdnFlow": fields.Float(required=False, load_from="CdnFlow"),
77-
"Date": fields.Int(required=False, load_from="Date"),
7875
"Flow": fields.Float(required=False, load_from="Flow"),
79-
"IaGetSize": fields.Float(required=False, load_from="IaGetSize"),
80-
"IaStorage": fields.Float(required=False, load_from="IaStorage"),
8176
"IdleFlow": fields.Float(required=False, load_from="IdleFlow"),
82-
"Storage": fields.Float(required=False, load_from="Storage"),
8377
}
8478

8579

86-
class UFileTotalReportItemSchema(schema.ResponseSchema):
87-
"""UFileTotalReportItem - 总消费信息"""
80+
class UFileDailyReportItemSchema(schema.ResponseSchema):
81+
"""UFileDailyReportItem -"""
8882

8983
fields = {
84+
"AcRestore": fields.Float(required=False, load_from="AcRestore"),
85+
"AcStorage": fields.Float(required=False, load_from="AcStorage"),
9086
"ApiTimes": fields.Float(required=False, load_from="ApiTimes"),
9187
"BusyFlow": fields.Float(required=False, load_from="BusyFlow"),
9288
"CdnFlow": fields.Float(required=False, load_from="CdnFlow"),
89+
"Date": fields.Int(required=False, load_from="Date"),
9390
"Flow": fields.Float(required=False, load_from="Flow"),
91+
"IaGetSize": fields.Float(required=False, load_from="IaGetSize"),
92+
"IaStorage": fields.Float(required=False, load_from="IaStorage"),
9493
"IdleFlow": fields.Float(required=False, load_from="IdleFlow"),
94+
"Storage": fields.Float(required=False, load_from="Storage"),
9595
}
9696

9797

‎ucloud/services/uhost/client.py

+36
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,42 @@ def get_uhost_instance_vnc_info(
893893
resp = self.invoke("GetUHostInstanceVncInfo", d, **kwargs)
894894
return apis.GetUHostInstanceVncInfoResponseSchema().loads(resp)
895895

896+
def get_uhost_renew_price(
897+
self, req: typing.Optional[dict] = None, **kwargs
898+
) -> dict:
899+
"""GetUHostRenewPrice - 获取主机续费价格
900+
901+
**Request**
902+
903+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
904+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
905+
- **ChargeType** (str) - (Required) 计费类型。Year，Month，Dynamic，默认返回全部计费方式对应的价格
906+
- **UHostId** (str) - (Required) UHost实例ID
907+
908+
**Response**
909+
910+
- **PriceSet** (list) - 见 **BasePriceSet** 模型定义
911+
912+
**Response Model**
913+
914+
**BasePriceSet**
915+
- **ChargeType** (str) - 计费类型
916+
- **OriginalPrice** (float) - 限时优惠的折前原价（即列表价乘以商务折扣后的单价）。
917+
- **Price** (float) - 价格，单位: 元，保留小数点后两位有效数字
918+
919+
920+
"""
921+
# build request
922+
d = {
923+
"ProjectId": self.config.project_id,
924+
"Region": self.config.region,
925+
}
926+
req and d.update(req)
927+
d = apis.GetUHostRenewPriceRequestSchema().dumps(d)
928+
929+
resp = self.invoke("GetUHostRenewPrice", d, **kwargs)
930+
return apis.GetUHostRenewPriceResponseSchema().loads(resp)
931+
896932
def get_uhost_upgrade_price(
897933
self, req: typing.Optional[dict] = None, **kwargs
898934
) -> dict:

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

+28
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,34 @@ class GetUHostInstanceVncInfoResponseSchema(schema.ResponseSchema):
776776
}
777777

778778

779+
"""
780+
API: GetUHostRenewPrice
781+
782+
获取主机续费价格
783+
"""
784+
785+
786+
class GetUHostRenewPriceRequestSchema(schema.RequestSchema):
787+
"""GetUHostRenewPrice - 获取主机续费价格"""
788+
789+
fields = {
790+
"ChargeType": fields.Str(required=True, dump_to="ChargeType"),
791+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
792+
"Region": fields.Str(required=True, dump_to="Region"),
793+
"UHostId": fields.Str(required=True, dump_to="UHostId"),
794+
}
795+
796+
797+
class GetUHostRenewPriceResponseSchema(schema.ResponseSchema):
798+
"""GetUHostRenewPrice - 获取主机续费价格"""
799+
800+
fields = {
801+
"PriceSet": fields.List(
802+
models.BasePriceSetSchema(), required=False, load_from="PriceSet"
803+
),
804+
}
805+
806+
779807
"""
780808
API: GetUHostUpgradePrice
781809

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

+21-9
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@ class BootDiskInfoSchema(schema.ResponseSchema):
6262
}
6363

6464

65-
class PerformanceSchema(schema.ResponseSchema):
66-
"""Performance - GPU的性能指标"""
67-
68-
fields = {
69-
"Rate": fields.Int(required=False, load_from="Rate"),
70-
"Value": fields.Float(required=False, load_from="Value"),
71-
}
72-
73-
7465
class MachineSizesSchema(schema.ResponseSchema):
7566
"""MachineSizes - GPU、CPU和内存信息"""
7667

@@ -118,6 +109,15 @@ class CpuPlatformsSchema(schema.ResponseSchema):
118109
}
119110

120111

112+
class PerformanceSchema(schema.ResponseSchema):
113+
"""Performance - GPU的性能指标"""
114+
115+
fields = {
116+
"Rate": fields.Int(required=False, load_from="Rate"),
117+
"Value": fields.Float(required=False, load_from="Value"),
118+
}
119+
120+
121121
class AvailableInstanceTypesSchema(schema.ResponseSchema):
122122
"""AvailableInstanceTypes - https://ushare.ucloudadmin.com/pages/viewpage.action?pageId=104662646"""
123123

@@ -343,3 +343,15 @@ class UHostPriceSetSchema(schema.ResponseSchema):
343343
"Price": fields.Float(required=True, load_from="Price"),
344344
"PriceDetail": PriceDetailSchema(),
345345
}
346+
347+
348+
class BasePriceSetSchema(schema.ResponseSchema):
349+
"""BasePriceSet - 价格信息"""
350+
351+
fields = {
352+
"ChargeType": fields.Str(required=False, load_from="ChargeType"),
353+
"OriginalPrice": fields.Float(
354+
required=False, load_from="OriginalPrice"
355+
),
356+
"Price": fields.Float(required=False, load_from="Price"),
357+
}

0 commit comments

Comments
 (0)