Skip to content

Commit 8acf814

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.69 (#275)
1 parent e0e12f5 commit 8acf814

File tree

13 files changed

+280
-218
lines changed

13 files changed

+280
-218
lines changed

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,13 @@ class SrcAreaInfoSchema(schema.ResponseSchema):
135135
}
136136

137137

138-
class OutPublicIpInfoSchema(schema.ResponseSchema):
139-
"""OutPublicIpInfo - 线路回源IP信息"""
138+
class ForwardTaskSchema(schema.ResponseSchema):
139+
"""ForwardTask -"""
140140

141141
fields = {
142-
"Area": fields.Str(required=False, load_from="Area"),
143-
"IP": fields.Str(required=False, load_from="IP"),
142+
"Port": fields.Int(required=True, load_from="Port"),
143+
"Protocol": fields.Str(required=True, load_from="Protocol"),
144+
"RSPort": fields.Int(required=True, load_from="RSPort"),
144145
}
145146

146147

@@ -155,13 +156,12 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
155156
}
156157

157158

158-
class ForwardTaskSchema(schema.ResponseSchema):
159-
"""ForwardTask -"""
159+
class OutPublicIpInfoSchema(schema.ResponseSchema):
160+
"""OutPublicIpInfo - 线路回源IP信息"""
160161

161162
fields = {
162-
"Port": fields.Int(required=True, load_from="Port"),
163-
"Protocol": fields.Str(required=True, load_from="Protocol"),
164-
"RSPort": fields.Int(required=True, load_from="RSPort"),
163+
"Area": fields.Str(required=False, load_from="Area"),
164+
"IP": fields.Str(required=False, load_from="IP"),
165165
}
166166

167167

@@ -246,15 +246,12 @@ class UPathSetSchema(schema.ResponseSchema):
246246
}
247247

248248

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

252252
fields = {
253253
"Port": fields.Int(required=True, load_from="Port"),
254254
"Protocol": fields.Str(required=True, load_from="Protocol"),
255-
"RSPort": fields.Int(required=True, load_from="RSPort"),
256-
"SSLId": fields.Str(required=False, load_from="SSLId"),
257-
"SSLName": fields.Str(required=False, load_from="SSLName"),
258255
}
259256

260257

@@ -268,12 +265,15 @@ class UGAL4ForwarderSchema(schema.ResponseSchema):
268265
}
269266

270267

271-
class UGAATaskSchema(schema.ResponseSchema):
272-
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
268+
class UGAL7ForwarderSchema(schema.ResponseSchema):
269+
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
273270

274271
fields = {
275272
"Port": fields.Int(required=True, load_from="Port"),
276273
"Protocol": fields.Str(required=True, load_from="Protocol"),
274+
"RSPort": fields.Int(required=True, load_from="RSPort"),
275+
"SSLId": fields.Str(required=False, load_from="SSLId"),
276+
"SSLName": fields.Str(required=False, load_from="SSLName"),
277277
}
278278

279279

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

344344

345-
class TrafficDailySchema(schema.ResponseSchema):
346-
"""TrafficDaily -"""
347-
348-
fields = {
349-
"BillingState": fields.Str(required=True, load_from="BillingState"),
350-
"Date": fields.Int(required=True, load_from="Date"),
351-
"Traffic": fields.Int(required=True, load_from="Traffic"),
352-
}
353-
354-
355345
class TrafficDailyRecentlySchema(schema.ResponseSchema):
356346
"""TrafficDailyRecently - 最近3个月日流量统计"""
357347

@@ -362,6 +352,16 @@ class TrafficDailyRecentlySchema(schema.ResponseSchema):
362352
}
363353

364354

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+
365365
class MatricPointSchema(schema.ResponseSchema):
366366
"""MatricPoint -"""
367367

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -339,29 +339,6 @@ class CacheAllConfigSchema(schema.ResponseSchema):
339339
}
340340

341341

342-
class AccessControlConfSchema(schema.ResponseSchema):
343-
"""AccessControlConf - 访问控制配置参数"""
344-
345-
fields = {
346-
"IpBlackList": fields.List(fields.Str()),
347-
"ReferConf": ReferConfSchema(),
348-
}
349-
350-
351-
class AdvancedConfSchema(schema.ResponseSchema):
352-
"""AdvancedConf - 域名高级配置"""
353-
354-
fields = {
355-
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
356-
"HttpClientHeader": fields.List(fields.Str()),
357-
"HttpOriginHeader": fields.List(fields.Str()),
358-
"QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
359-
"WebSocketEnable": fields.Bool(
360-
required=False, load_from="WebSocketEnable"
361-
),
362-
}
363-
364-
365342
class OriginConfSchema(schema.ResponseSchema):
366343
"""OriginConf - 回源配置"""
367344

@@ -391,6 +368,29 @@ class OriginConfSchema(schema.ResponseSchema):
391368
}
392369

393370

371+
class AdvancedConfSchema(schema.ResponseSchema):
372+
"""AdvancedConf - 域名高级配置"""
373+
374+
fields = {
375+
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
376+
"HttpClientHeader": fields.List(fields.Str()),
377+
"HttpOriginHeader": fields.List(fields.Str()),
378+
"QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
379+
"WebSocketEnable": fields.Bool(
380+
required=False, load_from="WebSocketEnable"
381+
),
382+
}
383+
384+
385+
class AccessControlConfSchema(schema.ResponseSchema):
386+
"""AccessControlConf - 访问控制配置参数"""
387+
388+
fields = {
389+
"IpBlackList": fields.List(fields.Str()),
390+
"ReferConf": ReferConfSchema(),
391+
}
392+
393+
394394
class DomainConfigInfoSchema(schema.ResponseSchema):
395395
"""DomainConfigInfo - 更新域名配置"""
396396

‎ucloud/services/ucompshare/client.py

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -76,42 +76,6 @@ def describe_comp_share_instance(
7676
7777
**Response Model**
7878
79-
**UHostIPSet**
80-
- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
81-
- **Default** (str) - 内网 Private 类型下，表示是否为默认网卡。true: 是默认网卡；其他值：不是。
82-
- **IP** (str) - IP地址
83-
- **IPId** (str) - 外网IP资源ID 。(内网IP无对应的资源ID)
84-
- **IPMode** (str) - IPv4/IPv6；
85-
- **Mac** (str) - 内网 Private 类型下，当前网卡的Mac。
86-
- **NetworkInterfaceId** (str) - 弹性网卡为默认网卡时，返回对应的 ID 值
87-
- **SubnetId** (str) - IP地址对应的子网 ID。（北京一不支持，字段返回为空）
88-
- **Type** (str) - 国际: Internation，BGP: Bgp，内网: Private
89-
- **VPCId** (str) - IP地址对应的VPC ID。（北京一不支持，字段返回为空）
90-
- **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。
91-
92-
93-
**UHostDiskSet**
94-
- **BackupType** (str) - 备份方案。若开通了数据方舟，则为DATAARK
95-
- **DiskId** (str) - 磁盘ID
96-
- **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。
97-
- **Drive** (str) - 磁盘盘符
98-
- **Encrypted** (str) - "true": 加密盘 "false"：非加密盘
99-
- **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。
100-
- **Name** (str) - UDisk名字（仅当磁盘是UDisk时返回）
101-
- **Size** (int) - 磁盘大小，单位: GB
102-
- **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk
103-
104-
105-
**GraphicsMemory**
106-
- **Rate** (int) - 交互展示参数，可忽略
107-
- **Value** (int) - 值，单位是GB
108-
109-
110-
**SoftwareAddr**
111-
- **Name** (str) - 软件名称
112-
- **URL** (str) - 软件地址
113-
114-
11579
**CompShareInstanceSet**
11680
- **AutoRenew** (str) - 是否自动续费，自动续费：“Yes”，不自动续费：“No”
11781
- **CPU** (int) - 虚拟CPU核数，单位: 个
@@ -158,6 +122,42 @@ def describe_comp_share_instance(
158122
- **Zone** (str) - 可用区
159123
160124
125+
**UHostDiskSet**
126+
- **BackupType** (str) - 备份方案。若开通了数据方舟，则为DATAARK
127+
- **DiskId** (str) - 磁盘ID
128+
- **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。
129+
- **Drive** (str) - 磁盘盘符
130+
- **Encrypted** (str) - "true": 加密盘 "false"：非加密盘
131+
- **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。
132+
- **Name** (str) - UDisk名字（仅当磁盘是UDisk时返回）
133+
- **Size** (int) - 磁盘大小，单位: GB
134+
- **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk
135+
136+
137+
**GraphicsMemory**
138+
- **Rate** (int) - 交互展示参数，可忽略
139+
- **Value** (int) - 值，单位是GB
140+
141+
142+
**UHostIPSet**
143+
- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
144+
- **Default** (str) - 内网 Private 类型下，表示是否为默认网卡。true: 是默认网卡；其他值：不是。
145+
- **IP** (str) - IP地址
146+
- **IPId** (str) - 外网IP资源ID 。(内网IP无对应的资源ID)
147+
- **IPMode** (str) - IPv4/IPv6；
148+
- **Mac** (str) - 内网 Private 类型下，当前网卡的Mac。
149+
- **NetworkInterfaceId** (str) - 弹性网卡为默认网卡时，返回对应的 ID 值
150+
- **SubnetId** (str) - IP地址对应的子网 ID。（北京一不支持，字段返回为空）
151+
- **Type** (str) - 国际: Internation，BGP: Bgp，内网: Private
152+
- **VPCId** (str) - IP地址对应的VPC ID。（北京一不支持，字段返回为空）
153+
- **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。
154+
155+
156+
**SoftwareAddr**
157+
- **Name** (str) - 软件名称
158+
- **URL** (str) - 软件地址
159+
160+
161161
"""
162162
# build request
163163
d = {
@@ -259,6 +259,16 @@ def describe_ul_host_instance(
259259
- **Type** (str) - 磁盘类型。系统盘："Boot"；数据盘："Data"
260260
261261
262+
**ExclusiveUTPInfo**
263+
- **AvailableSize** (int) - 当前周期剩余流量
264+
- **CreateTime** (int) - 创建时间
265+
- **ExcessSize** (int) - 当前周期超出限额的流量
266+
- **LastResetTime** (int) - 上次重置时间
267+
- **NextResetTime** (int) - 下次重置时间
268+
- **TotalSize** (int) - 当前周期总流量
269+
- **UsedSize** (int) - 当前周期已使用流量
270+
271+
262272
**UHostIPSet**
263273
- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
264274
- **Default** (str) - 内网 Private 类型下，表示是否为默认网卡。true: 是默认网卡；其他值：不是。
@@ -273,16 +283,6 @@ def describe_ul_host_instance(
273283
- **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。
274284
275285
276-
**ExclusiveUTPInfo**
277-
- **AvailableSize** (int) - 当前周期剩余流量
278-
- **CreateTime** (int) - 创建时间
279-
- **ExcessSize** (int) - 当前周期超出限额的流量
280-
- **LastResetTime** (int) - 上次重置时间
281-
- **NextResetTime** (int) - 下次重置时间
282-
- **TotalSize** (int) - 当前周期总流量
283-
- **UsedSize** (int) - 当前周期已使用流量
284-
285-
286286
"""
287287
# build request
288288
d = {
@@ -454,6 +454,36 @@ def reboot_ul_host_instance(
454454
resp = self.invoke("RebootULHostInstance", d, **kwargs)
455455
return apis.RebootULHostInstanceResponseSchema().loads(resp)
456456

457+
def reinstall_comp_share_instance(
458+
self, req: typing.Optional[dict] = None, **kwargs
459+
) -> dict:
460+
"""ReinstallCompShareInstance - 重装算力平台实例
461+
462+
**Request**
463+
464+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
465+
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
466+
- **CompShareImageId** (str) - (Required) 镜像Id
467+
- **Password** (str) - (Required) 实例的新密码
468+
- **UHostId** (str) - (Required) 实例Id
469+
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
470+
471+
**Response**
472+
473+
- **UHostId** (str) - 实例Id
474+
475+
"""
476+
# build request
477+
d = {
478+
"ProjectId": self.config.project_id,
479+
"Region": self.config.region,
480+
}
481+
req and d.update(req)
482+
d = apis.ReinstallCompShareInstanceRequestSchema().dumps(d)
483+
484+
resp = self.invoke("ReinstallCompShareInstance", d, **kwargs)
485+
return apis.ReinstallCompShareInstanceResponseSchema().loads(resp)
486+
457487
def reinstall_ul_host_instance(
458488
self, req: typing.Optional[dict] = None, **kwargs
459489
) -> dict:

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,36 @@ class RebootULHostInstanceResponseSchema(schema.ResponseSchema):
274274
}
275275

276276

277+
"""
278+
API: ReinstallCompShareInstance
279+
280+
重装算力平台实例
281+
"""
282+
283+
284+
class ReinstallCompShareInstanceRequestSchema(schema.RequestSchema):
285+
"""ReinstallCompShareInstance - 重装算力平台实例"""
286+
287+
fields = {
288+
"CompShareImageId": fields.Str(
289+
required=True, dump_to="CompShareImageId"
290+
),
291+
"Password": fields.Str(required=True, dump_to="Password"),
292+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
293+
"Region": fields.Str(required=True, dump_to="Region"),
294+
"UHostId": fields.Str(required=True, dump_to="UHostId"),
295+
"Zone": fields.Str(required=True, dump_to="Zone"),
296+
}
297+
298+
299+
class ReinstallCompShareInstanceResponseSchema(schema.ResponseSchema):
300+
"""ReinstallCompShareInstance - 重装算力平台实例"""
301+
302+
fields = {
303+
"UHostId": fields.Str(required=True, load_from="UHostId"),
304+
}
305+
306+
277307
"""
278308
API: ReinstallULHostInstance
279309

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

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

144144

145-
class ULHostDiskSetSchema(schema.ResponseSchema):
146-
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""
147-
148-
fields = {
149-
"DiskId": fields.Str(required=False, load_from="DiskId"),
150-
"DiskType": fields.Str(required=False, load_from="DiskType"),
151-
"Drive": fields.Str(required=False, load_from="Drive"),
152-
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
153-
"Size": fields.Int(required=False, load_from="Size"),
154-
"Type": fields.Str(required=False, load_from="Type"),
155-
}
156-
157-
158145
class ExclusiveUTPInfoSchema(schema.ResponseSchema):
159146
"""ExclusiveUTPInfo - 流量包详情"""
160147

@@ -169,6 +156,19 @@ class ExclusiveUTPInfoSchema(schema.ResponseSchema):
169156
}
170157

171158

159+
class ULHostDiskSetSchema(schema.ResponseSchema):
160+
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""
161+
162+
fields = {
163+
"DiskId": fields.Str(required=False, load_from="DiskId"),
164+
"DiskType": fields.Str(required=False, load_from="DiskType"),
165+
"Drive": fields.Str(required=False, load_from="Drive"),
166+
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
167+
"Size": fields.Int(required=False, load_from="Size"),
168+
"Type": fields.Str(required=False, load_from="Type"),
169+
}
170+
171+
172172
class ULHostInstanceSetSchema(schema.ResponseSchema):
173173
"""ULHostInstanceSet - 轻量应用云主机详情"""
174174

0 commit comments

Comments
 (0)