Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 57 additions & 48 deletions ucloud/services/udisk/client.py

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions ucloud/services/udisk/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class AttachUDiskRequestSchema(schema.RequestSchema):
required=False, dump_to="EnableCrossPodAttach"
),
"HostId": fields.Str(required=False, dump_to="HostId"),
"Lable": fields.Str(required=False, dump_to="Lable"),
"MultiAttach": fields.Str(required=False, dump_to="MultiAttach"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Region": fields.Str(required=True, dump_to="Region"),
Expand Down Expand Up @@ -245,6 +246,7 @@ class CreateUDiskRequestSchema(schema.RequestSchema):
"DiskType": fields.Str(required=False, dump_to="DiskType"),
"Hour": fields.Int(required=False, dump_to="Hour"),
"Journal": fields.Int(required=False, dump_to="Journal"),
"Labels": fields.Str(required=False, dump_to="Labels"),
"Name": fields.Str(required=True, dump_to="Name"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Quantity": fields.Int(required=False, dump_to="Quantity"),
Expand Down Expand Up @@ -355,12 +357,12 @@ class DeleteUDiskSnapshotResponseSchema(schema.ResponseSchema):
"""
API: DescribeRecycleUDisk

拉取回收站中云硬盘列表

"""


class DescribeRecycleUDiskRequestSchema(schema.RequestSchema):
"""DescribeRecycleUDisk - 拉取回收站中云硬盘列表"""
"""DescribeRecycleUDisk -"""

fields = {
"Limit": fields.Int(required=False, dump_to="Limit"),
Expand All @@ -372,7 +374,7 @@ class DescribeRecycleUDiskRequestSchema(schema.RequestSchema):


class DescribeRecycleUDiskResponseSchema(schema.ResponseSchema):
"""DescribeRecycleUDisk - 拉取回收站中云硬盘列表"""
"""DescribeRecycleUDisk -"""

fields = {
"DataSet": fields.List(
Expand Down Expand Up @@ -417,6 +419,7 @@ class DescribeUDiskRequestSchema(schema.RequestSchema):
"Tag": fields.Str(required=False, dump_to="Tag"),
"UDiskBasicInfo": fields.Str(required=False, dump_to="UDiskBasicInfo"),
"UDiskId": fields.Str(required=False, dump_to="UDiskId"),
"UDiskName": fields.Str(required=False, dump_to="UDiskName"),
"UHostIdForAttachment": fields.Str(
required=False, dump_to="UHostIdForAttachment"
),
Expand Down Expand Up @@ -614,12 +617,12 @@ class DetachUDiskResponseSchema(schema.ResponseSchema):
"""
API: RecoverUDisk

从回收站中恢复云硬盘

"""


class RecoverUDiskRequestSchema(schema.RequestSchema):
"""RecoverUDisk - 从回收站中恢复云硬盘"""
"""RecoverUDisk -"""

fields = {
"ChargeType": fields.Str(required=False, dump_to="ChargeType"),
Expand All @@ -632,7 +635,7 @@ class RecoverUDiskRequestSchema(schema.RequestSchema):


class RecoverUDiskResponseSchema(schema.ResponseSchema):
"""RecoverUDisk - 从回收站中恢复云硬盘"""
"""RecoverUDisk -"""

fields = {}

Expand Down
2 changes: 1 addition & 1 deletion ucloud/services/udisk/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


class RecycleUDiskSetSchema(schema.ResponseSchema):
"""RecycleUDiskSet - 回收站列表"""
"""RecycleUDiskSet -"""

fields = {
"CountdownTime": fields.Int(required=True, load_from="CountdownTime"),
Expand Down
12 changes: 6 additions & 6 deletions ucloud/services/ulogservice/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,11 @@ def query_u_log_service_log(

**Response Model**

**AnalysisField**
- **Name** (str) - 字段名
- **Type** (str) - 字段类型


**LogContent**
- **FileName** (str) - 日志文件路径
- **HostName** (str) - 日志来源主机
Expand All @@ -685,15 +690,10 @@ def query_u_log_service_log(
- **Timestamp** (int) - 日志时间


**AnalysisField**
- **Name** (str) - 字段名
- **Type** (str) - 字段类型


**LogQueryResult**
- **AnalysisRecords** (list) - 当使用SQL语句查询时,数据通过该字段返回
- **Columns** (list) - 见 **AnalysisField** 模型定义
- **Contents** (dict) - 见 **LogContent** 模型定义
- **Contents** (list) - 见 **LogContent** 模型定义
- **IsOver** (bool) - 检索结果是否到底
- **LastId** (str) - 滚动检索,当前页最后一条数据ID
- **LastTimestamp** (str) - 滚动检索,当前页最后一条数据Timestamp
Expand Down
2 changes: 1 addition & 1 deletion ucloud/services/ulogservice/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class LogQueryResultSchema(schema.ResponseSchema):
fields = {
"AnalysisRecords": fields.List(fields.Str()),
"Columns": fields.List(AnalysisFieldSchema()),
"Contents": LogContentSchema(),
"Contents": fields.List(LogContentSchema()),
"IsOver": fields.Bool(required=True, load_from="IsOver"),
"LastId": fields.Str(required=False, load_from="LastId"),
"LastTimestamp": fields.Str(required=False, load_from="LastTimestamp"),
Expand Down
2 changes: 1 addition & 1 deletion ucloud/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.11.157"
version = "0.11.158"
Loading