From 4c6bc3881f37d3a818d8c6f58be36e6bfacbffef Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Wed, 12 Jul 2023 08:16:27 +0000 Subject: [PATCH] sdk: rolling update for 0.11.50 --- ucloud/services/ipsecvpn/schemas/models.py | 48 +++++++------- ucloud/services/pathx/schemas/models.py | 30 ++++----- ucloud/services/uads/schemas/models.py | 20 +++--- ucloud/services/ubill/client.py | 1 + ucloud/services/ubill/schemas/models.py | 13 ++-- ucloud/services/ucdn/schemas/models.py | 28 ++++---- ucloud/services/ucompshare/schemas/models.py | 26 ++++---- ucloud/services/udb/client.py | 2 +- ucloud/services/udb/schemas/apis.py | 2 +- ucloud/services/uec/schemas/models.py | 28 ++++---- ucloud/services/uhost/schemas/models.py | 42 ++++++------ ucloud/services/uk8s/schemas/models.py | 16 ++--- ucloud/services/ulb/schemas/models.py | 70 ++++++++++---------- ucloud/services/unet/schemas/models.py | 20 +++--- ucloud/services/vpc/schemas/models.py | 38 +++++------ ucloud/version.py | 2 +- 16 files changed, 194 insertions(+), 192 deletions(-) diff --git a/ucloud/services/ipsecvpn/schemas/models.py b/ucloud/services/ipsecvpn/schemas/models.py index e6744625..66d3d68c 100644 --- a/ucloud/services/ipsecvpn/schemas/models.py +++ b/ucloud/services/ipsecvpn/schemas/models.py @@ -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参数""" @@ -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信息""" diff --git a/ucloud/services/pathx/schemas/models.py b/ucloud/services/pathx/schemas/models.py index 355366a1..9e06b411 100644 --- a/ucloud/services/pathx/schemas/models.py +++ b/ucloud/services/pathx/schemas/models.py @@ -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层转发器信息""" @@ -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 - 全球加速实例信息""" diff --git a/ucloud/services/uads/schemas/models.py b/ucloud/services/uads/schemas/models.py index 56fe830b..4f011a25 100644 --- a/ucloud/services/uads/schemas/models.py +++ b/ucloud/services/uads/schemas/models.py @@ -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 - 资源信息""" @@ -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信息""" diff --git a/ucloud/services/ubill/client.py b/ucloud/services/ubill/client.py index 925ff3d8..73c2b486 100644 --- a/ucloud/services/ubill/client.py +++ b/ucloud/services/ubill/client.py @@ -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:删除恢复 diff --git a/ucloud/services/ubill/schemas/models.py b/ucloud/services/ubill/schemas/models.py index d2c8d696..ed75007e 100644 --- a/ucloud/services/ubill/schemas/models.py +++ b/ucloud/services/ubill/schemas/models.py @@ -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"), } @@ -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"), diff --git a/ucloud/services/ucdn/schemas/models.py b/ucloud/services/ucdn/schemas/models.py index 5001cc25..7c04bcb3 100644 --- a/ucloud/services/ucdn/schemas/models.py +++ b/ucloud/services/ucdn/schemas/models.py @@ -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 - 忽略参数缓存配置""" @@ -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(), } @@ -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 - 更新域名配置""" diff --git a/ucloud/services/ucompshare/schemas/models.py b/ucloud/services/ucompshare/schemas/models.py index 1d3c8ddf..c23070a9 100644 --- a/ucloud/services/ucompshare/schemas/models.py +++ b/ucloud/services/ucompshare/schemas/models.py @@ -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 -""" @@ -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 - 轻量应用云主机详情""" diff --git a/ucloud/services/udb/client.py b/ucloud/services/udb/client.py index e9f26f27..4632f354 100644 --- a/ucloud/services/udb/client.py +++ b/ucloud/services/udb/client.py @@ -223,9 +223,9 @@ def clear_udb_log( - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **BeforeTime** (int) - (Required) 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天 - **DBId** (str) - (Required) DB实例的id,该值可以通过DescribeUDBInstance获取 - **LogType** (int) - (Required) 日志类型,10-error(暂不支持)、20-slow(暂不支持 )、30-binlog - - **BeforeTime** (int) - 删除时间点(至少前一天)之前log,采用时间戳(秒),默认当 前时间点前一天 - **Zone** (str) - 可用区。参见 `可用区列表 `_ **Response** diff --git a/ucloud/services/udb/schemas/apis.py b/ucloud/services/udb/schemas/apis.py index 598523b6..e7816e75 100644 --- a/ucloud/services/udb/schemas/apis.py +++ b/ucloud/services/udb/schemas/apis.py @@ -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"), diff --git a/ucloud/services/uec/schemas/models.py b/ucloud/services/uec/schemas/models.py index 18b2bb36..3cc45025 100644 --- a/ucloud/services/uec/schemas/models.py +++ b/ucloud/services/uec/schemas/models.py @@ -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 - 容器环境变量列表""" @@ -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"), } @@ -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 - 容器组镜像密钥列表""" diff --git a/ucloud/services/uhost/schemas/models.py b/ucloud/services/uhost/schemas/models.py index 15de96b5..215cd9c0 100644 --- a/ucloud/services/uhost/schemas/models.py +++ b/ucloud/services/uhost/schemas/models.py @@ -62,21 +62,21 @@ class BootDiskInfoSchema(schema.ResponseSchema): } -class MachineSizesSchema(schema.ResponseSchema): - """MachineSizes - GPU、CPU和内存信息""" +class PerformanceSchema(schema.ResponseSchema): + """Performance - GPU的性能指标""" fields = { - "Collection": fields.List(CollectionSchema()), - "Gpu": fields.Int(required=False, load_from="Gpu"), + "Rate": fields.Int(required=False, load_from="Rate"), + "Value": fields.Float(required=False, load_from="Value"), } -class GraphicsMemorySchema(schema.ResponseSchema): - """GraphicsMemory - GPU的显存指标""" +class MachineSizesSchema(schema.ResponseSchema): + """MachineSizes - GPU、CPU和内存信息""" fields = { - "Rate": fields.Int(required=False, load_from="Rate"), - "Value": fields.Int(required=False, load_from="Value"), + "Collection": fields.List(CollectionSchema()), + "Gpu": fields.Int(required=False, load_from="Gpu"), } @@ -89,12 +89,12 @@ class FeaturesSchema(schema.ResponseSchema): } -class PerformanceSchema(schema.ResponseSchema): - """Performance - GPU的性能指标""" +class GraphicsMemorySchema(schema.ResponseSchema): + """GraphicsMemory - GPU的显存指标""" fields = { "Rate": fields.Int(required=False, load_from="Rate"), - "Value": fields.Float(required=False, load_from="Value"), + "Value": fields.Int(required=False, load_from="Value"), } @@ -196,16 +196,6 @@ class UHostKeyPairSchema(schema.ResponseSchema): } -class UDSetUDHostAttributeSchema(schema.ResponseSchema): - """UDSetUDHostAttribute - 私有专区对应的宿主机属性""" - - fields = { - "HostBinding": fields.Bool(required=False, load_from="HostBinding"), - "UDHostId": fields.Str(required=False, load_from="UDHostId"), - "UDSetId": fields.Str(required=False, load_from="UDSetId"), - } - - class SpotAttributeSchema(schema.ResponseSchema): """SpotAttribute - 竞价实例属性""" @@ -250,6 +240,16 @@ class UHostDiskSetSchema(schema.ResponseSchema): } +class UDSetUDHostAttributeSchema(schema.ResponseSchema): + """UDSetUDHostAttribute - 私有专区对应的宿主机属性""" + + fields = { + "HostBinding": fields.Bool(required=False, load_from="HostBinding"), + "UDHostId": fields.Str(required=False, load_from="UDHostId"), + "UDSetId": fields.Str(required=False, load_from="UDSetId"), + } + + class UHostInstanceSetSchema(schema.ResponseSchema): """UHostInstanceSet - DescribeUHostInstance""" diff --git a/ucloud/services/uk8s/schemas/models.py b/ucloud/services/uk8s/schemas/models.py index 87b39cf7..2b1dd98a 100644 --- a/ucloud/services/uk8s/schemas/models.py +++ b/ucloud/services/uk8s/schemas/models.py @@ -32,14 +32,6 @@ class DiskSetSchema(schema.ResponseSchema): } -class KubeProxySchema(schema.ResponseSchema): - """KubeProxy - KubeProxy信息""" - - fields = { - "Mode": fields.Str(required=False, load_from="Mode"), - } - - class UhostInfoSchema(schema.ResponseSchema): """UhostInfo - 机器信息""" @@ -59,6 +51,14 @@ class UhostInfoSchema(schema.ResponseSchema): } +class KubeProxySchema(schema.ResponseSchema): + """KubeProxy - KubeProxy信息""" + + fields = { + "Mode": fields.Str(required=False, load_from="Mode"), + } + + class ImageInfoSchema(schema.ResponseSchema): """ImageInfo - UK8S 可用镜像信息""" diff --git a/ucloud/services/ulb/schemas/models.py b/ucloud/services/ulb/schemas/models.py index 5d3c8eb7..8a310628 100644 --- a/ucloud/services/ulb/schemas/models.py +++ b/ucloud/services/ulb/schemas/models.py @@ -99,32 +99,6 @@ class PolicyBackendSetSchema(schema.ResponseSchema): } -class ULBBackendSetSchema(schema.ResponseSchema): - """ULBBackendSet - DescribeULB""" - - fields = { - "BackendId": fields.Str(required=False, load_from="BackendId"), - "Enabled": fields.Int(required=False, load_from="Enabled"), - "IsBackup": fields.Int(required=False, load_from="IsBackup"), - "Port": fields.Int(required=False, load_from="Port"), - "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), - "ResourceId": fields.Str(required=False, load_from="ResourceId"), - "ResourceName": fields.Str(required=False, load_from="ResourceName"), - "ResourceType": fields.Str(required=False, load_from="ResourceType"), - "Status": fields.Int(required=False, load_from="Status"), - "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), - "SubResourceName": fields.Str( - required=False, load_from="SubResourceName" - ), - "SubResourceType": fields.Str( - required=False, load_from="SubResourceType" - ), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "Weight": fields.Int(required=False, load_from="Weight"), - } - - class BindSecurityPolicySchema(schema.ResponseSchema): """BindSecurityPolicy - VServer绑定的安全策略组信息""" @@ -163,6 +137,32 @@ class ULBPolicySetSchema(schema.ResponseSchema): } +class ULBBackendSetSchema(schema.ResponseSchema): + """ULBBackendSet - DescribeULB""" + + fields = { + "BackendId": fields.Str(required=False, load_from="BackendId"), + "Enabled": fields.Int(required=False, load_from="Enabled"), + "IsBackup": fields.Int(required=False, load_from="IsBackup"), + "Port": fields.Int(required=False, load_from="Port"), + "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), + "ResourceId": fields.Str(required=False, load_from="ResourceId"), + "ResourceName": fields.Str(required=False, load_from="ResourceName"), + "ResourceType": fields.Str(required=False, load_from="ResourceType"), + "Status": fields.Int(required=False, load_from="Status"), + "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), + "SubResourceName": fields.Str( + required=False, load_from="SubResourceName" + ), + "SubResourceType": fields.Str( + required=False, load_from="SubResourceType" + ), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "Weight": fields.Int(required=False, load_from="Weight"), + } + + class LoggerSetSchema(schema.ResponseSchema): """LoggerSet - ulb日志信息""" @@ -209,6 +209,15 @@ class ULBVServerSetSchema(schema.ResponseSchema): } +class FirewallSetSchema(schema.ResponseSchema): + """FirewallSet - ulb防火墙信息""" + + fields = { + "FirewallId": fields.Str(required=False, load_from="FirewallId"), + "FirewallName": fields.Str(required=False, load_from="FirewallName"), + } + + class ULBIPSetSchema(schema.ResponseSchema): """ULBIPSet - DescribeULB""" @@ -221,15 +230,6 @@ class ULBIPSetSchema(schema.ResponseSchema): } -class FirewallSetSchema(schema.ResponseSchema): - """FirewallSet - ulb防火墙信息""" - - fields = { - "FirewallId": fields.Str(required=False, load_from="FirewallId"), - "FirewallName": fields.Str(required=False, load_from="FirewallName"), - } - - class ULBSetSchema(schema.ResponseSchema): """ULBSet - DescribeULB""" diff --git a/ucloud/services/unet/schemas/models.py b/ucloud/services/unet/schemas/models.py index c71f6a5b..72817e2b 100644 --- a/ucloud/services/unet/schemas/models.py +++ b/ucloud/services/unet/schemas/models.py @@ -55,6 +55,16 @@ class UnetBandwidthUsageEIPSetSchema(schema.ResponseSchema): } +class EIPBindingSchema(schema.ResponseSchema): + """EIPBinding - EIP绑定内网IP关系数据""" + + fields = { + "EIP": fields.Str(required=False, load_from="EIP"), + "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), + "PrivateIPType": fields.Str(required=False, load_from="PrivateIPType"), + } + + class ShareBandwidthSetSchema(schema.ResponseSchema): """ShareBandwidthSet - DescribeEIP""" @@ -71,16 +81,6 @@ class ShareBandwidthSetSchema(schema.ResponseSchema): } -class EIPBindingSchema(schema.ResponseSchema): - """EIPBinding - EIP绑定内网IP关系数据""" - - fields = { - "EIP": fields.Str(required=False, load_from="EIP"), - "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), - "PrivateIPType": fields.Str(required=False, load_from="PrivateIPType"), - } - - class UnetEIPResourceSetSchema(schema.ResponseSchema): """UnetEIPResourceSet - DescribeEIP""" diff --git a/ucloud/services/vpc/schemas/models.py b/ucloud/services/vpc/schemas/models.py index cd3d211d..5bba8e48 100644 --- a/ucloud/services/vpc/schemas/models.py +++ b/ucloud/services/vpc/schemas/models.py @@ -117,6 +117,16 @@ class NatGWIPResInfoSchema(schema.ResponseSchema): } +class NatGatewaySubnetSetSchema(schema.ResponseSchema): + """NatGatewaySubnetSet - natgw里面的子网信息""" + + fields = { + "Subnet": fields.Str(required=True, load_from="Subnet"), + "SubnetName": fields.Str(required=True, load_from="SubnetName"), + "SubnetworkId": fields.Str(required=True, load_from="SubnetworkId"), + } + + class NatGatewayIPSetSchema(schema.ResponseSchema): """NatGatewayIPSet - IPSet信息""" @@ -129,16 +139,6 @@ class NatGatewayIPSetSchema(schema.ResponseSchema): } -class NatGatewaySubnetSetSchema(schema.ResponseSchema): - """NatGatewaySubnetSet - natgw里面的子网信息""" - - fields = { - "Subnet": fields.Str(required=True, load_from="Subnet"), - "SubnetName": fields.Str(required=True, load_from="SubnetName"), - "SubnetworkId": fields.Str(required=True, load_from="SubnetworkId"), - } - - class NatGatewayDataSetSchema(schema.ResponseSchema): """NatGatewayDataSet - natgw的信息""" @@ -231,15 +231,6 @@ class AclInfoSchema(schema.ResponseSchema): } -class UNIIpInfoSchema(schema.ResponseSchema): - """UNIIpInfo - 虚拟网卡内网IP信息""" - - fields = { - "IpAddr": fields.List(fields.Str()), - "IpType": fields.Str(required=False, load_from="IpType"), - } - - class UNIQuotaInfoSchema(schema.ResponseSchema): """UNIQuotaInfo - 虚拟网卡内网IP配额使用情况""" @@ -253,6 +244,15 @@ class UNIQuotaInfoSchema(schema.ResponseSchema): } +class UNIIpInfoSchema(schema.ResponseSchema): + """UNIIpInfo - 虚拟网卡内网IP信息""" + + fields = { + "IpAddr": fields.List(fields.Str()), + "IpType": fields.Str(required=False, load_from="IpType"), + } + + class NetworkInterfaceSchema(schema.ResponseSchema): """NetworkInterface - 虚拟网卡信息""" diff --git a/ucloud/version.py b/ucloud/version.py index b0b02286..e823a9dd 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.49" +version = "0.11.50"