diff --git a/ucloud/services/ipsecvpn/schemas/models.py b/ucloud/services/ipsecvpn/schemas/models.py index 66d3d68c..e6744625 100644 --- a/ucloud/services/ipsecvpn/schemas/models.py +++ b/ucloud/services/ipsecvpn/schemas/models.py @@ -49,30 +49,6 @@ 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参数""" @@ -98,6 +74,30 @@ 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 6b8408e0..ad3cc148 100644 --- a/ucloud/services/pathx/schemas/models.py +++ b/ucloud/services/pathx/schemas/models.py @@ -135,15 +135,6 @@ class SrcAreaInfoSchema(schema.ResponseSchema): } -class OutPublicIpInfoSchema(schema.ResponseSchema): - """OutPublicIpInfo - 线路回源IP信息""" - - fields = { - "Area": fields.Str(required=False, load_from="Area"), - "IP": fields.Str(required=False, load_from="IP"), - } - - class AccelerationAreaInfosSchema(schema.ResponseSchema): """AccelerationAreaInfos -""" @@ -165,6 +156,15 @@ class ForwardTaskSchema(schema.ResponseSchema): } +class OutPublicIpInfoSchema(schema.ResponseSchema): + """OutPublicIpInfo - 线路回源IP信息""" + + fields = { + "Area": fields.Str(required=False, load_from="Area"), + "IP": fields.Str(required=False, load_from="IP"), + } + + class ForwardInfoSchema(schema.ResponseSchema): """ForwardInfo -""" @@ -240,16 +240,6 @@ class UGAATaskSchema(schema.ResponseSchema): } -class UGAL4ForwarderSchema(schema.ResponseSchema): - """UGAL4Forwarder - UGA实例 4层转发器信息""" - - fields = { - "Port": fields.Int(required=True, load_from="Port"), - "Protocol": fields.Str(required=True, load_from="Protocol"), - "RSPort": fields.Int(required=True, load_from="RSPort"), - } - - class UPathSetSchema(schema.ResponseSchema): """UPathSet - uga关联的upath信息""" @@ -277,6 +267,16 @@ class UGAL7ForwarderSchema(schema.ResponseSchema): } +class UGAL4ForwarderSchema(schema.ResponseSchema): + """UGAL4Forwarder - UGA实例 4层转发器信息""" + + fields = { + "Port": fields.Int(required=True, load_from="Port"), + "Protocol": fields.Str(required=True, load_from="Protocol"), + "RSPort": fields.Int(required=True, load_from="RSPort"), + } + + class UGAAInfoSchema(schema.ResponseSchema): """UGAAInfo - 全球加速实例信息""" diff --git a/ucloud/services/ucdn/schemas/models.py b/ucloud/services/ucdn/schemas/models.py index 03750847..903df2a1 100644 --- a/ucloud/services/ucdn/schemas/models.py +++ b/ucloud/services/ucdn/schemas/models.py @@ -3,6 +3,14 @@ from ucloud.core.typesystem import schema, fields +class AccessConfSchema(schema.ResponseSchema): + """AccessConf - 访问控制""" + + fields = { + "IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"), + } + + class CacheConfSchema(schema.ResponseSchema): """CacheConf - 缓存配置""" @@ -21,14 +29,6 @@ class CacheConfSchema(schema.ResponseSchema): } -class AccessConfSchema(schema.ResponseSchema): - """AccessConf - 访问控制""" - - fields = { - "IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"), - } - - class DomainInfoSchema(schema.ResponseSchema): """DomainInfo - 域名配置""" diff --git a/ucloud/services/udi/client.py b/ucloud/services/udi/client.py index 2a7747e6..bc236f06 100644 --- a/ucloud/services/udi/client.py +++ b/ucloud/services/udi/client.py @@ -178,11 +178,12 @@ def describe_media_functions( **Response Model** - **ParamCustom** - - **Max** (int) - - - **Min** (int) - - - **ParamName** (str) - - - **ParamType** (str) - + **Function** + - **DisplayName** (str) - + - **FunctionName** (str) - + - **InputType** (str) - + - **OutputType** (str) - + - **SupportParams** (list) - 见 **ParamOption** 模型定义 **ParamOption** @@ -193,12 +194,11 @@ def describe_media_functions( - **WhenValueCustom** (list) - 见 **ParamCustom** 模型定义 - **Function** - - **DisplayName** (str) - - - **FunctionName** (str) - - - **InputType** (str) - - - **OutputType** (str) - - - **SupportParams** (list) - 见 **ParamOption** 模型定义 + **ParamCustom** + - **Max** (int) - + - **Min** (int) - + - **ParamName** (str) - + - **ParamType** (str) - """ diff --git a/ucloud/services/uec/schemas/models.py b/ucloud/services/uec/schemas/models.py index 7fd21521..c56e9bc3 100644 --- a/ucloud/services/uec/schemas/models.py +++ b/ucloud/services/uec/schemas/models.py @@ -78,6 +78,17 @@ class IpListSchema(schema.ResponseSchema): } +class StorVolumeInfoSchema(schema.ResponseSchema): + """StorVolumeInfo - 容器组存储卷信息""" + + fields = { + "DiskSize": fields.Int(required=False, load_from="DiskSize"), + "MountPoint": fields.Str(required=False, load_from="MountPoint"), + "Name": fields.Str(required=False, load_from="Name"), + "ResourceId": fields.Str(required=False, load_from="ResourceId"), + } + + class DockerInfoSchema(schema.ResponseSchema): """DockerInfo - 容器信息""" @@ -105,17 +116,6 @@ class ImageListSchema(schema.ResponseSchema): } -class StorVolumeInfoSchema(schema.ResponseSchema): - """StorVolumeInfo - 容器组存储卷信息""" - - fields = { - "DiskSize": fields.Int(required=False, load_from="DiskSize"), - "MountPoint": fields.Str(required=False, load_from="MountPoint"), - "Name": fields.Str(required=False, load_from="Name"), - "ResourceId": fields.Str(required=False, load_from="ResourceId"), - } - - class HolderListSchema(schema.ResponseSchema): """HolderList - 容器组信息""" diff --git a/ucloud/services/ufile/schemas/models.py b/ucloud/services/ufile/schemas/models.py index c358691e..df019d23 100644 --- a/ucloud/services/ufile/schemas/models.py +++ b/ucloud/services/ufile/schemas/models.py @@ -65,33 +65,33 @@ class LifeCycleItemSchema(schema.ResponseSchema): } -class UFileDailyReportItemSchema(schema.ResponseSchema): - """UFileDailyReportItem -""" +class UFileTotalReportItemSchema(schema.ResponseSchema): + """UFileTotalReportItem - 总消费信息""" fields = { - "AcRestore": fields.Float(required=False, load_from="AcRestore"), - "AcStorage": fields.Float(required=False, load_from="AcStorage"), "ApiTimes": fields.Float(required=False, load_from="ApiTimes"), "BusyFlow": fields.Float(required=False, load_from="BusyFlow"), "CdnFlow": fields.Float(required=False, load_from="CdnFlow"), - "Date": fields.Int(required=False, load_from="Date"), "Flow": fields.Float(required=False, load_from="Flow"), - "IaGetSize": fields.Float(required=False, load_from="IaGetSize"), - "IaStorage": fields.Float(required=False, load_from="IaStorage"), "IdleFlow": fields.Float(required=False, load_from="IdleFlow"), - "Storage": fields.Float(required=False, load_from="Storage"), } -class UFileTotalReportItemSchema(schema.ResponseSchema): - """UFileTotalReportItem - 总消费信息""" +class UFileDailyReportItemSchema(schema.ResponseSchema): + """UFileDailyReportItem -""" fields = { + "AcRestore": fields.Float(required=False, load_from="AcRestore"), + "AcStorage": fields.Float(required=False, load_from="AcStorage"), "ApiTimes": fields.Float(required=False, load_from="ApiTimes"), "BusyFlow": fields.Float(required=False, load_from="BusyFlow"), "CdnFlow": fields.Float(required=False, load_from="CdnFlow"), + "Date": fields.Int(required=False, load_from="Date"), "Flow": fields.Float(required=False, load_from="Flow"), + "IaGetSize": fields.Float(required=False, load_from="IaGetSize"), + "IaStorage": fields.Float(required=False, load_from="IaStorage"), "IdleFlow": fields.Float(required=False, load_from="IdleFlow"), + "Storage": fields.Float(required=False, load_from="Storage"), } diff --git a/ucloud/services/uhost/client.py b/ucloud/services/uhost/client.py index a9986274..d3e25af1 100644 --- a/ucloud/services/uhost/client.py +++ b/ucloud/services/uhost/client.py @@ -893,6 +893,42 @@ def get_uhost_instance_vnc_info( resp = self.invoke("GetUHostInstanceVncInfo", d, **kwargs) return apis.GetUHostInstanceVncInfoResponseSchema().loads(resp) + def get_uhost_renew_price( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """GetUHostRenewPrice - 获取主机续费价格 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **ChargeType** (str) - (Required) 计费类型。Year,Month,Dynamic,默认返回全部计费方式对应的价格 + - **UHostId** (str) - (Required) UHost实例ID + + **Response** + + - **PriceSet** (list) - 见 **BasePriceSet** 模型定义 + + **Response Model** + + **BasePriceSet** + - **ChargeType** (str) - 计费类型 + - **OriginalPrice** (float) - 限时优惠的折前原价(即列表价乘以商务折扣后的单价)。 + - **Price** (float) - 价格,单位: 元,保留小数点后两位有效数字 + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.GetUHostRenewPriceRequestSchema().dumps(d) + + resp = self.invoke("GetUHostRenewPrice", d, **kwargs) + return apis.GetUHostRenewPriceResponseSchema().loads(resp) + def get_uhost_upgrade_price( self, req: typing.Optional[dict] = None, **kwargs ) -> dict: diff --git a/ucloud/services/uhost/schemas/apis.py b/ucloud/services/uhost/schemas/apis.py index f9733e6f..75890f37 100644 --- a/ucloud/services/uhost/schemas/apis.py +++ b/ucloud/services/uhost/schemas/apis.py @@ -776,6 +776,34 @@ class GetUHostInstanceVncInfoResponseSchema(schema.ResponseSchema): } +""" +API: GetUHostRenewPrice + +获取主机续费价格 +""" + + +class GetUHostRenewPriceRequestSchema(schema.RequestSchema): + """GetUHostRenewPrice - 获取主机续费价格""" + + fields = { + "ChargeType": fields.Str(required=True, dump_to="ChargeType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + } + + +class GetUHostRenewPriceResponseSchema(schema.ResponseSchema): + """GetUHostRenewPrice - 获取主机续费价格""" + + fields = { + "PriceSet": fields.List( + models.BasePriceSetSchema(), required=False, load_from="PriceSet" + ), + } + + """ API: GetUHostUpgradePrice diff --git a/ucloud/services/uhost/schemas/models.py b/ucloud/services/uhost/schemas/models.py index d78278e0..86551066 100644 --- a/ucloud/services/uhost/schemas/models.py +++ b/ucloud/services/uhost/schemas/models.py @@ -62,15 +62,6 @@ class BootDiskInfoSchema(schema.ResponseSchema): } -class PerformanceSchema(schema.ResponseSchema): - """Performance - GPU的性能指标""" - - fields = { - "Rate": fields.Int(required=False, load_from="Rate"), - "Value": fields.Float(required=False, load_from="Value"), - } - - class MachineSizesSchema(schema.ResponseSchema): """MachineSizes - GPU、CPU和内存信息""" @@ -118,6 +109,15 @@ class CpuPlatformsSchema(schema.ResponseSchema): } +class PerformanceSchema(schema.ResponseSchema): + """Performance - GPU的性能指标""" + + fields = { + "Rate": fields.Int(required=False, load_from="Rate"), + "Value": fields.Float(required=False, load_from="Value"), + } + + class AvailableInstanceTypesSchema(schema.ResponseSchema): """AvailableInstanceTypes - https://ushare.ucloudadmin.com/pages/viewpage.action?pageId=104662646""" @@ -343,3 +343,15 @@ class UHostPriceSetSchema(schema.ResponseSchema): "Price": fields.Float(required=True, load_from="Price"), "PriceDetail": PriceDetailSchema(), } + + +class BasePriceSetSchema(schema.ResponseSchema): + """BasePriceSet - 价格信息""" + + fields = { + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "OriginalPrice": fields.Float( + required=False, load_from="OriginalPrice" + ), + "Price": fields.Float(required=False, load_from="Price"), + } diff --git a/ucloud/services/uk8s/schemas/models.py b/ucloud/services/uk8s/schemas/models.py index fc68d43d..2b1dd98a 100644 --- a/ucloud/services/uk8s/schemas/models.py +++ b/ucloud/services/uk8s/schemas/models.py @@ -3,6 +3,18 @@ from ucloud.core.typesystem import schema, fields +class IPSetSchema(schema.ResponseSchema): + """IPSet - 节点的IP信息""" + + fields = { + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "Default": fields.Str(required=False, load_from="Default"), + "IP": fields.Str(required=False, load_from="IP"), + "IPId": fields.Str(required=False, load_from="IPId"), + "Type": fields.Str(required=False, load_from="Type"), + } + + class DiskSetSchema(schema.ResponseSchema): """DiskSet - 节点磁盘信息""" @@ -20,18 +32,6 @@ class DiskSetSchema(schema.ResponseSchema): } -class IPSetSchema(schema.ResponseSchema): - """IPSet - 节点的IP信息""" - - fields = { - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "Default": fields.Str(required=False, load_from="Default"), - "IP": fields.Str(required=False, load_from="IP"), - "IPId": fields.Str(required=False, load_from="IPId"), - "Type": fields.Str(required=False, load_from="Type"), - } - - class UhostInfoSchema(schema.ResponseSchema): """UhostInfo - 机器信息""" diff --git a/ucloud/services/ulb/schemas/models.py b/ucloud/services/ulb/schemas/models.py index 575650c5..40870b4d 100644 --- a/ucloud/services/ulb/schemas/models.py +++ b/ucloud/services/ulb/schemas/models.py @@ -99,6 +99,24 @@ class PolicyBackendSetSchema(schema.ResponseSchema): } +class BindSecurityPolicySchema(schema.ResponseSchema): + """BindSecurityPolicy - VServer绑定的安全策略组信息""" + + fields = { + "SSLCiphers": fields.List(fields.Str()), + "SecurityPolicyId": fields.Str( + required=False, load_from="SecurityPolicyId" + ), + "SecurityPolicyName": fields.Str( + required=False, load_from="SecurityPolicyName" + ), + "SecurityPolicyType": fields.Int( + required=False, load_from="SecurityPolicyType" + ), + "TLSVersion": fields.Str(required=False, load_from="TLSVersion"), + } + + class ULBPolicySetSchema(schema.ResponseSchema): """ULBPolicySet - 内容转发详细列表""" @@ -119,24 +137,6 @@ class ULBPolicySetSchema(schema.ResponseSchema): } -class BindSecurityPolicySchema(schema.ResponseSchema): - """BindSecurityPolicy - VServer绑定的安全策略组信息""" - - fields = { - "SSLCiphers": fields.List(fields.Str()), - "SecurityPolicyId": fields.Str( - required=False, load_from="SecurityPolicyId" - ), - "SecurityPolicyName": fields.Str( - required=False, load_from="SecurityPolicyName" - ), - "SecurityPolicyType": fields.Int( - required=False, load_from="SecurityPolicyType" - ), - "TLSVersion": fields.Str(required=False, load_from="TLSVersion"), - } - - class ULBBackendSetSchema(schema.ResponseSchema): """ULBBackendSet - DescribeULB""" @@ -163,6 +163,18 @@ class ULBBackendSetSchema(schema.ResponseSchema): } +class ULBIPSetSchema(schema.ResponseSchema): + """ULBIPSet - DescribeULB""" + + fields = { + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), + "EIP": fields.Str(required=False, load_from="EIP"), + "EIPId": fields.Str(required=False, load_from="EIPId"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), + } + + class ULBVServerSetSchema(schema.ResponseSchema): """ULBVServerSet - DescribeULB""" @@ -199,34 +211,22 @@ class ULBVServerSetSchema(schema.ResponseSchema): } -class LoggerSetSchema(schema.ResponseSchema): - """LoggerSet - ulb日志信息""" - - fields = { - "BucketName": fields.Str(required=False, load_from="BucketName"), - "TokenID": fields.Str(required=False, load_from="TokenID"), - "TokenName": fields.Str(required=False, load_from="TokenName"), - } - - -class ULBIPSetSchema(schema.ResponseSchema): - """ULBIPSet - DescribeULB""" +class FirewallSetSchema(schema.ResponseSchema): + """FirewallSet - ulb防火墙信息""" fields = { - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), - "EIP": fields.Str(required=False, load_from="EIP"), - "EIPId": fields.Str(required=False, load_from="EIPId"), - "OperatorName": fields.Str(required=False, load_from="OperatorName"), + "FirewallId": fields.Str(required=False, load_from="FirewallId"), + "FirewallName": fields.Str(required=False, load_from="FirewallName"), } -class FirewallSetSchema(schema.ResponseSchema): - """FirewallSet - ulb防火墙信息""" +class LoggerSetSchema(schema.ResponseSchema): + """LoggerSet - ulb日志信息""" fields = { - "FirewallId": fields.Str(required=False, load_from="FirewallId"), - "FirewallName": fields.Str(required=False, load_from="FirewallName"), + "BucketName": fields.Str(required=False, load_from="BucketName"), + "TokenID": fields.Str(required=False, load_from="TokenID"), + "TokenName": fields.Str(required=False, load_from="TokenName"), } diff --git a/ucloud/services/umem/schemas/models.py b/ucloud/services/umem/schemas/models.py index 3a92b71e..2ed82651 100644 --- a/ucloud/services/umem/schemas/models.py +++ b/ucloud/services/umem/schemas/models.py @@ -25,6 +25,15 @@ class UDRedisSlowlogSetSchema(schema.ResponseSchema): } +class UMemSpaceAddressSetSchema(schema.ResponseSchema): + """UMemSpaceAddressSet - DescribeUMemSpace""" + + fields = { + "IP": fields.Str(required=False, load_from="IP"), + "Port": fields.Int(required=False, load_from="Port"), + } + + class UMemSlaveDataSetSchema(schema.ResponseSchema): """UMemSlaveDataSet - DescribeUMem""" @@ -55,15 +64,6 @@ class UMemSlaveDataSetSchema(schema.ResponseSchema): } -class UMemSpaceAddressSetSchema(schema.ResponseSchema): - """UMemSpaceAddressSet - DescribeUMemSpace""" - - fields = { - "IP": fields.Str(required=False, load_from="IP"), - "Port": fields.Int(required=False, load_from="Port"), - } - - class UMemDataSetSchema(schema.ResponseSchema): """UMemDataSet - DescribeUMem""" diff --git a/ucloud/services/uphone/schemas/models.py b/ucloud/services/uphone/schemas/models.py index 976110db..8e5d1d84 100644 --- a/ucloud/services/uphone/schemas/models.py +++ b/ucloud/services/uphone/schemas/models.py @@ -206,16 +206,6 @@ class UPhoneModelInstanceSchema(schema.ResponseSchema): } -class ServerDiskSetSchema(schema.ResponseSchema): - """ServerDiskSet -""" - - fields = { - "DiskType": fields.Str(required=True, load_from="DiskType"), - "IsBoot": fields.Bool(required=True, load_from="IsBoot"), - "Size": fields.Int(required=True, load_from="Size"), - } - - class UPhoneSpecSchema(schema.ResponseSchema): """UPhoneSpec -""" @@ -227,14 +217,13 @@ class UPhoneSpecSchema(schema.ResponseSchema): } -class IpSetSchema(schema.ResponseSchema): - """IpSet -""" +class ServerDiskSetSchema(schema.ResponseSchema): + """ServerDiskSet -""" fields = { - "Ip": fields.Str(required=False, load_from="Ip"), - "IpMode": fields.Str(required=False, load_from="IpMode"), - "IpType": fields.Str(required=False, load_from="IpType"), - "Isp": fields.Str(required=False, load_from="Isp"), + "DiskType": fields.Str(required=True, load_from="DiskType"), + "IsBoot": fields.Bool(required=True, load_from="IsBoot"), + "Size": fields.Int(required=True, load_from="Size"), } @@ -257,6 +246,17 @@ class ServerModelInstanceSchema(schema.ResponseSchema): } +class IpSetSchema(schema.ResponseSchema): + """IpSet -""" + + fields = { + "Ip": fields.Str(required=False, load_from="Ip"), + "IpMode": fields.Str(required=False, load_from="IpMode"), + "IpType": fields.Str(required=False, load_from="IpType"), + "Isp": fields.Str(required=False, load_from="Isp"), + } + + class ServerInstanceSchema(schema.ResponseSchema): """ServerInstance -""" diff --git a/ucloud/services/uphost/schemas/models.py b/ucloud/services/uphost/schemas/models.py index c92a8fee..ae2ff79a 100644 --- a/ucloud/services/uphost/schemas/models.py +++ b/ucloud/services/uphost/schemas/models.py @@ -44,6 +44,20 @@ class PHostCloudMachineTypeSetSchema(schema.ResponseSchema): } +class PHostIPSetSchema(schema.ResponseSchema): + """PHostIPSet - DescribePHost""" + + fields = { + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "IPAddr": fields.Str(required=False, load_from="IPAddr"), + "IPId": fields.Str(required=False, load_from="IPId"), + "MACAddr": fields.Str(required=False, load_from="MACAddr"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + } + + class PHostDescDiskSetSchema(schema.ResponseSchema): """PHostDescDiskSet - DescribePHost(包括传统和裸金属1、裸金属2)""" @@ -59,20 +73,6 @@ class PHostDescDiskSetSchema(schema.ResponseSchema): } -class PHostIPSetSchema(schema.ResponseSchema): - """PHostIPSet - DescribePHost""" - - fields = { - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "IPAddr": fields.Str(required=False, load_from="IPAddr"), - "IPId": fields.Str(required=False, load_from="IPId"), - "MACAddr": fields.Str(required=False, load_from="MACAddr"), - "OperatorName": fields.Str(required=False, load_from="OperatorName"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - } - - class PHostSetSchema(schema.ResponseSchema): """PHostSet - DescribePHost""" diff --git a/ucloud/services/vpc/schemas/models.py b/ucloud/services/vpc/schemas/models.py index 5bba8e48..cd4e8ca0 100644 --- a/ucloud/services/vpc/schemas/models.py +++ b/ucloud/services/vpc/schemas/models.py @@ -117,16 +117,6 @@ 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信息""" @@ -139,6 +129,16 @@ 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的信息""" diff --git a/ucloud/version.py b/ucloud/version.py index 1147f81a..ec23c17b 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.46" +version = "0.11.47"