Skip to content

sdk: rolling update for 0.11.50 #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2023
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
48 changes: 24 additions & 24 deletions ucloud/services/ipsecvpn/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,30 @@ class VPNGatewayDataSetSchema(schema.ResponseSchema):
}


class IKEDataSchema(schema.ResponseSchema):
"""IKEData - IKE信息"""

fields = {
"IKEAuthenticationAlgorithm": fields.Str(
required=False, load_from="IKEAuthenticationAlgorithm"
),
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
"IKEEncryptionAlgorithm": fields.Str(
required=False, load_from="IKEEncryptionAlgorithm"
),
"IKEExchangeMode": fields.Str(
required=False, load_from="IKEExchangeMode"
),
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
"IKEPreSharedKey": fields.Str(
required=False, load_from="IKEPreSharedKey"
),
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
}


class IPSecDataSchema(schema.ResponseSchema):
"""IPSecData - IPSec参数"""

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


class IKEDataSchema(schema.ResponseSchema):
"""IKEData - IKE信息"""

fields = {
"IKEAuthenticationAlgorithm": fields.Str(
required=False, load_from="IKEAuthenticationAlgorithm"
),
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
"IKEEncryptionAlgorithm": fields.Str(
required=False, load_from="IKEEncryptionAlgorithm"
),
"IKEExchangeMode": fields.Str(
required=False, load_from="IKEExchangeMode"
),
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
"IKEPreSharedKey": fields.Str(
required=False, load_from="IKEPreSharedKey"
),
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
}


class VPNTunnelDataSetSchema(schema.ResponseSchema):
"""VPNTunnelDataSet - DescribeVPNTunnel信息"""

Expand Down
30 changes: 15 additions & 15 deletions ucloud/services/pathx/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,21 @@ class UGAATaskSchema(schema.ResponseSchema):
}


class UPathSetSchema(schema.ResponseSchema):
"""UPathSet - uga关联的upath信息"""

fields = {
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
"LineId": fields.Str(required=False, load_from="LineId"),
"LineTo": fields.Str(required=False, load_from="LineTo"),
"LineToName": fields.Str(required=False, load_from="LineToName"),
"UPathId": fields.Str(required=False, load_from="UPathId"),
"UPathName": fields.Str(required=False, load_from="UPathName"),
}


class UGAL7ForwarderSchema(schema.ResponseSchema):
"""UGAL7Forwarder - UGA实例 7层转发器信息"""

Expand All @@ -262,21 +277,6 @@ class UGAL4ForwarderSchema(schema.ResponseSchema):
}


class UPathSetSchema(schema.ResponseSchema):
"""UPathSet - uga关联的upath信息"""

fields = {
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
"LineFrom": fields.Str(required=False, load_from="LineFrom"),
"LineFromName": fields.Str(required=False, load_from="LineFromName"),
"LineId": fields.Str(required=False, load_from="LineId"),
"LineTo": fields.Str(required=False, load_from="LineTo"),
"LineToName": fields.Str(required=False, load_from="LineToName"),
"UPathId": fields.Str(required=False, load_from="UPathId"),
"UPathName": fields.Str(required=False, load_from="UPathName"),
}


class UGAAInfoSchema(schema.ResponseSchema):
"""UGAAInfo - 全球加速实例信息"""

Expand Down
20 changes: 10 additions & 10 deletions ucloud/services/uads/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,6 @@ class ServiceInfoSchema(schema.ResponseSchema):
}


class EIPAddrSetSchema(schema.ResponseSchema):
"""EIPAddrSet - EIP地址信息"""

fields = {
"EIPType": fields.Str(required=False, load_from="EIPType"),
"IP": fields.Str(required=False, load_from="IP"),
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
}


class ResouceSchema(schema.ResponseSchema):
"""Resouce - 资源信息"""

Expand All @@ -105,6 +95,16 @@ class ResouceSchema(schema.ResponseSchema):
}


class EIPAddrSetSchema(schema.ResponseSchema):
"""EIPAddrSet - EIP地址信息"""

fields = {
"EIPType": fields.Str(required=False, load_from="EIPType"),
"IP": fields.Str(required=False, load_from="IP"),
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
}


class IPInfoSchema(schema.ResponseSchema):
"""IPInfo - 高防IP信息"""

Expand Down
1 change: 1 addition & 0 deletions ucloud/services/ubill/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def list_u_bill_detail(
- **AzGroupCName** (str) - 可用区
- **ChargeType** (str) - 计费方式 (筛选项, 默认全部)。枚举值:\\ > Year:按年\\ > Month:按月 \\ > Day:按天 \\ > Dynamic:按时 \\ > Used:按量 \\ > Donate:赠送 \\ > Trial:试用 \\ > Post:后付费 \\ > Spot:抢占式
- **CreateTime** (int) - 创建时间(时间戳)
- **EndTime** (int) - 结束时间(时间戳)
- **ItemDetails** (list) - 见 **ItemDetail** 模型定义
- **OrderNo** (str) - 订单号
- **OrderType** (str) - 订单类型 (筛选项, 默认全部) 。枚举值:\\ > OT_BUY:新购 \\ > OT_RENEW:续费 \\ > OT_UPGRADE:升级 \\ > OT_DOWNGRADE:降级 \\ > OT_SUSPEND:结算 \\ > OT_ADDITIONAL:补单 \\ > OT_REFUND:删除 \\ > OT_POSTPAID_RENEW:过期 \\ > OT_POSTPAID_PAYMENT:后付费 \\ > OT_RECOVER:删除恢复
Expand Down
13 changes: 7 additions & 6 deletions ucloud/services/ubill/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ class AccountInfoSchema(schema.ResponseSchema):
}


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

fields = {
"KeyId": fields.Str(required=True, load_from="KeyId"),
"ProductName": fields.Str(required=True, load_from="ProductName"),
"Value": fields.Str(required=True, load_from="Value"),
}


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

fields = {
"ProductName": fields.Str(required=True, load_from="ProductName"),
"KeyId": fields.Str(required=True, load_from="KeyId"),
"Value": fields.Str(required=True, load_from="Value"),
}

Expand All @@ -47,6 +47,7 @@ class BillDetailItemSchema(schema.ResponseSchema):
"AzGroupCName": fields.Str(required=True, load_from="AzGroupCName"),
"ChargeType": fields.Str(required=True, load_from="ChargeType"),
"CreateTime": fields.Int(required=True, load_from="CreateTime"),
"EndTime": fields.Int(required=True, load_from="EndTime"),
"ItemDetails": fields.List(ItemDetailSchema()),
"OrderNo": fields.Str(required=True, load_from="OrderNo"),
"OrderType": fields.Str(required=True, load_from="OrderType"),
Expand Down
28 changes: 14 additions & 14 deletions ucloud/services/ucdn/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,16 @@ class BandwidthTrafficInfoSchema(schema.ResponseSchema):
}


class ReferConfSchema(schema.ResponseSchema):
"""ReferConf - refer配置"""

fields = {
"NullRefer": fields.Int(required=False, load_from="NullRefer"),
"ReferList": fields.List(fields.Str()),
"ReferType": fields.Int(required=False, load_from="ReferType"),
}


class CacheKeyInfoSchema(schema.ResponseSchema):
"""CacheKeyInfo - 忽略参数缓存配置"""

Expand All @@ -304,13 +314,12 @@ class CacheKeyInfoSchema(schema.ResponseSchema):
}


class ReferConfSchema(schema.ResponseSchema):
"""ReferConf - refer配置"""
class AccessControlConfSchema(schema.ResponseSchema):
"""AccessControlConf - 访问控制配置参数"""

fields = {
"NullRefer": fields.Int(required=False, load_from="NullRefer"),
"ReferList": fields.List(fields.Str()),
"ReferType": fields.Int(required=False, load_from="ReferType"),
"IpBlackList": fields.List(fields.Str()),
"ReferConf": ReferConfSchema(),
}


Expand Down Expand Up @@ -368,15 +377,6 @@ class AdvancedConfSchema(schema.ResponseSchema):
}


class AccessControlConfSchema(schema.ResponseSchema):
"""AccessControlConf - 访问控制配置参数"""

fields = {
"IpBlackList": fields.List(fields.Str()),
"ReferConf": ReferConfSchema(),
}


class DomainConfigInfoSchema(schema.ResponseSchema):
"""DomainConfigInfo - 更新域名配置"""

Expand Down
26 changes: 13 additions & 13 deletions ucloud/services/ucompshare/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,6 @@ class BundleSchema(schema.ResponseSchema):
}


class ULHostDiskSetSchema(schema.ResponseSchema):
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""

fields = {
"DiskId": fields.Str(required=False, load_from="DiskId"),
"DiskType": fields.Str(required=False, load_from="DiskType"),
"Drive": fields.Str(required=False, load_from="Drive"),
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
"Size": fields.Int(required=False, load_from="Size"),
"Type": fields.Str(required=False, load_from="Type"),
}


class UHostIPSetSchema(schema.ResponseSchema):
"""UHostIPSet -"""

Expand All @@ -49,6 +36,19 @@ class UHostIPSetSchema(schema.ResponseSchema):
}


class ULHostDiskSetSchema(schema.ResponseSchema):
"""ULHostDiskSet - 轻量应用主机的磁盘信息"""

fields = {
"DiskId": fields.Str(required=False, load_from="DiskId"),
"DiskType": fields.Str(required=False, load_from="DiskType"),
"Drive": fields.Str(required=False, load_from="Drive"),
"IsBoot": fields.Str(required=False, load_from="IsBoot"),
"Size": fields.Int(required=False, load_from="Size"),
"Type": fields.Str(required=False, load_from="Type"),
}


class ULHostInstanceSetSchema(schema.ResponseSchema):
"""ULHostInstanceSet - 轻量应用云主机详情"""

Expand Down
2 changes: 1 addition & 1 deletion ucloud/services/udb/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ def clear_udb_log(

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **BeforeTime** (int) - (Required) 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天
- **DBId** (str) - (Required) DB实例的id,该值可以通过DescribeUDBInstance获取
- **LogType** (int) - (Required) 日志类型,10-error(暂不支持)、20-slow(暂不支持 )、30-binlog
- **BeforeTime** (int) - 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天
- **Zone** (str) - 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_

**Response**
Expand Down
2 changes: 1 addition & 1 deletion ucloud/services/udb/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class ClearUDBLogRequestSchema(schema.RequestSchema):
"""ClearUDBLog - 清除UDB实例的log"""

fields = {
"BeforeTime": fields.Int(required=False, dump_to="BeforeTime"),
"BeforeTime": fields.Int(required=True, dump_to="BeforeTime"),
"DBId": fields.Str(required=True, dump_to="DBId"),
"LogType": fields.Int(required=True, dump_to="LogType"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
Expand Down
28 changes: 14 additions & 14 deletions ucloud/services/uec/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ class ResourceInfoSchema(schema.ResponseSchema):
}


class CfgDictListSchema(schema.ResponseSchema):
"""CfgDictList - 容器配置字典列表"""

fields = {
"MountPath": fields.Str(required=False, load_from="MountPath"),
"Name": fields.Str(required=False, load_from="Name"),
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
}


class EnvListSchema(schema.ResponseSchema):
"""EnvList - 容器环境变量列表"""

Expand All @@ -69,12 +59,13 @@ class EnvListSchema(schema.ResponseSchema):
}


class IpListSchema(schema.ResponseSchema):
"""IpList - 容器组外网ip列表"""
class CfgDictListSchema(schema.ResponseSchema):
"""CfgDictList - 容器配置字典列表"""

fields = {
"Ip": fields.Str(required=False, load_from="Ip"),
"Isp": fields.Str(required=False, load_from="Isp"),
"MountPath": fields.Str(required=False, load_from="MountPath"),
"Name": fields.Str(required=False, load_from="Name"),
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
}


Expand All @@ -95,6 +86,15 @@ class DockerInfoSchema(schema.ResponseSchema):
}


class IpListSchema(schema.ResponseSchema):
"""IpList - 容器组外网ip列表"""

fields = {
"Ip": fields.Str(required=False, load_from="Ip"),
"Isp": fields.Str(required=False, load_from="Isp"),
}


class ImageListSchema(schema.ResponseSchema):
"""ImageList - 容器组镜像密钥列表"""

Expand Down
Loading