diff --git a/ucloud/services/pathx/schemas/models.py b/ucloud/services/pathx/schemas/models.py index 44188445..7c210445 100644 --- a/ucloud/services/pathx/schemas/models.py +++ b/ucloud/services/pathx/schemas/models.py @@ -135,6 +135,15 @@ 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 -""" @@ -156,15 +165,6 @@ 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 -""" @@ -231,15 +231,6 @@ class AccelerationInfoSchema(schema.ResponseSchema): } -class UGAATaskSchema(schema.ResponseSchema): - """UGAATask - 用户在UGAA实例下配置的多端口任务""" - - fields = { - "Port": fields.Int(required=True, load_from="Port"), - "Protocol": fields.Str(required=True, load_from="Protocol"), - } - - class UPathSetSchema(schema.ResponseSchema): """UPathSet - uga关联的upath信息""" @@ -277,6 +268,15 @@ class UGAL4ForwarderSchema(schema.ResponseSchema): } +class UGAATaskSchema(schema.ResponseSchema): + """UGAATask - 用户在UGAA实例下配置的多端口任务""" + + fields = { + "Port": fields.Int(required=True, load_from="Port"), + "Protocol": fields.Str(required=True, load_from="Protocol"), + } + + class UGAAInfoSchema(schema.ResponseSchema): """UGAAInfo - 全球加速实例信息""" @@ -342,16 +342,6 @@ class AlarmRulerSchema(schema.ResponseSchema): } -class TrafficDailyRecentlySchema(schema.ResponseSchema): - """TrafficDailyRecently - 最近3个月日流量统计""" - - fields = { - "Day": fields.Str(required=False, load_from="Day"), - "TrafficUnitGB": fields.Str(required=False, load_from="TrafficUnitGB"), - "TrafficUnitMB": fields.Str(required=False, load_from="TrafficUnitMB"), - } - - class TrafficDailySchema(schema.ResponseSchema): """TrafficDaily -""" @@ -362,6 +352,16 @@ class TrafficDailySchema(schema.ResponseSchema): } +class TrafficDailyRecentlySchema(schema.ResponseSchema): + """TrafficDailyRecently - 最近3个月日流量统计""" + + fields = { + "Day": fields.Str(required=False, load_from="Day"), + "TrafficUnitGB": fields.Str(required=False, load_from="TrafficUnitGB"), + "TrafficUnitMB": fields.Str(required=False, load_from="TrafficUnitMB"), + } + + class MatricPointSchema(schema.ResponseSchema): """MatricPoint -""" diff --git a/ucloud/services/ucdn/schemas/models.py b/ucloud/services/ucdn/schemas/models.py index cee2c395..e8fb47ca 100644 --- a/ucloud/services/ucdn/schemas/models.py +++ b/ucloud/services/ucdn/schemas/models.py @@ -339,6 +339,15 @@ class CacheAllConfigSchema(schema.ResponseSchema): } +class AccessControlConfSchema(schema.ResponseSchema): + """AccessControlConf - 访问控制配置参数""" + + fields = { + "IpBlackList": fields.List(fields.Str()), + "ReferConf": ReferConfSchema(), + } + + class AdvancedConfSchema(schema.ResponseSchema): """AdvancedConf - 域名高级配置""" @@ -382,15 +391,6 @@ class OriginConfSchema(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/client.py b/ucloud/services/ucompshare/client.py index df33655e..b0b22a05 100644 --- a/ucloud/services/ucompshare/client.py +++ b/ucloud/services/ucompshare/client.py @@ -31,6 +31,9 @@ def create_ul_host_instance( - **CouponId** (str) - 主机代金券ID。请通过DescribeCoupon接口查询,或登录用户中心查看 - **Name** (str) - 轻量应用主机名称。默认:套餐ID。请遵照 `字段规范 `_ 设定实例名称。 - **Quantity** (int) - 购买时长。默认:1。不支持购买到月末 + - **SecurityGroupId** (str) - 防火墙ID,默认:Web推荐防火墙。如何查询SecurityGroupId请参见 `DescribeFirewall `_ 。 + - **SubnetId** (str) - 子网 ID。默认为当前地域的默认子网。 + - **VPCId** (str) - VPC ID。默认为当前地域的默认VPC。 **Response** @@ -52,6 +55,121 @@ def create_ul_host_instance( resp = self.invoke("CreateULHostInstance", d, **kwargs) return apis.CreateULHostInstanceResponseSchema().loads(resp) + def describe_comp_share_instance( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """DescribeCompShareInstance - 获取用户所有地域下主机资源信息列表 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **Limit** (int) - 返回数据长度,默认为20,最大100 + - **Offset** (int) - 列表起始位置偏移量,默认为0 + - **UHostIds** (list) - 【数组】UHost主机的资源ID,例如UHostIds.0代表希望获取信息 的主机1,UHostIds.1代表主机2。 如果不传入,则返回当前Region 所有符合条件的UHost实例。 + - **Zone** (str) - 可用区。参见 `可用区列表 `_ + + **Response** + + - **TotalCount** (int) - UHostInstance总数 + - **UHostSet** (list) - 见 **CompShareInstanceSet** 模型定义 + + **Response Model** + + **UHostIPSet** + - **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息) + - **Default** (str) - 内网 Private 类型下,表示是否为默认网卡。true: 是默认网卡;其他值:不是。 + - **IP** (str) - IP地址 + - **IPId** (str) - 外网IP资源ID 。(内网IP无对应的资源ID) + - **IPMode** (str) - IPv4/IPv6; + - **Mac** (str) - 内网 Private 类型下,当前网卡的Mac。 + - **NetworkInterfaceId** (str) - 弹性网卡为默认网卡时,返回对应的 ID 值 + - **SubnetId** (str) - IP地址对应的子网 ID。(北京一不支持,字段返回为空) + - **Type** (str) - 国际: Internation,BGP: Bgp,内网: Private + - **VPCId** (str) - IP地址对应的VPC ID。(北京一不支持,字段返回为空) + - **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。 + + + **UHostDiskSet** + - **BackupType** (str) - 备份方案。若开通了数据方舟,则为DATAARK + - **DiskId** (str) - 磁盘ID + - **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + - **Drive** (str) - 磁盘盘符 + - **Encrypted** (str) - "true": 加密盘 "false":非加密盘 + - **IsBoot** (str) - 是否是系统盘。枚举值:\\ > True,是系统盘 \\ > False,是数据盘(默认)。Disks数组中有且只能有一块盘是系统盘。 + - **Name** (str) - UDisk名字(仅当磁盘是UDisk时返回) + - **Size** (int) - 磁盘大小,单位: GB + - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot,数据盘: Data,网络盘:Udisk + + + **GraphicsMemory** + - **Rate** (int) - 交互展示参数,可忽略 + - **Value** (int) - 值,单位是GB + + + **SoftwareAddr** + - **Name** (str) - 软件名称 + - **URL** (str) - 软件地址 + + + **CompShareInstanceSet** + - **AutoRenew** (str) - 是否自动续费,自动续费:“Yes”,不自动续费:“No” + - **CPU** (int) - 虚拟CPU核数,单位: 个 + - **ChargeType** (str) - 计费模式,枚举值为: Year,按年付费; Month,按月付费; Dynamic,按时付费;Postpay,按需付费 + - **CompShareImageBillId** (str) - 用于镜像计费的Id + - **CompShareImageId** (str) - 镜像Id + - **CompShareImageName** (str) - 镜像名称 + - **CompShareImageOwnerAlias** (str) - 镜像来源 + - **CompShareImagePrice** (float) - 镜像价格 + - **CompShareImageStatus** (str) - 镜像状态 + - **CompShareImageType** (str) - 镜像类型- System 系统镜像- App 应用镜像- Custom 自制镜像- Community 社区镜像 + - **CpuArch** (str) - CPU架构。"x86_64"/"i386"等 + - **CpuPlatform** (str) - CPU平台。如"Intel/Auto"、"Amd/Auto"等等 + - **CreateTime** (str) - 创建时间 + - **DiskSet** (list) - 见 **UHostDiskSet** 模型定义 + - **ExpireTime** (str) - 过期时间 + - **GPU** (int) - GPU个数 + - **GpuType** (str) - GPU类型。如: "4090" + - **GraphicsMemory** (dict) - 见 **GraphicsMemory** 模型定义 + - **HostIp** (str) - 【内部API返回】宿主IP + - **HugepageCfg** (str) - 【内部API返回】大页内存 + - **IPSet** (list) - 见 **UHostIPSet** 模型定义 + - **InstancePrice** (float) - 主机价格 + - **InstanceType** (str) - 实例类型。"UHost": 普通主机;"Container": 容器主机 + - **IsExpire** (str) - 是否过期。Yes:已过期;No:未过期 + - **MachineType** (str) - 机型信息 + - **Memory** (str) - 内存大小,单位:MB + - **Name** (str) - 实例名称 + - **OsName** (str) - 虚机镜像的名称 + - **OsType** (str) - 虚机镜像操作系统类型。"Linux"\"Windows" + - **Password** (str) - 主机密码。由Base64编码 + - **PodId** (str) - 【内部API返回】udisk podId + - **PostPayShutdown** (bool) - 【内部API返回】后付费关机 + - **QemuFullVersion** (str) - 【内部API返回】Qemu完整版本号 + - **QemuVersion** (str) - 【内部API返回】Qemu版本号 + - **Remark** (str) - 实例备注 + - **SetId** (int) - 【内部API返回】宿主所在Set Id + - **Softwares** (list) - 见 **SoftwareAddr** 模型定义 + - **State** (str) - 实例状态,枚举值:\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ >升级改配中: Resizing; \\ > 未知(空字符串,获取状态超时或出错): + - **Tag** (str) - 实例业务组 + - **TotalDiskSpace** (int) - 总的数据盘存储空间 + - **UHostId** (str) - 实例Id + - **UUID** (str) - 【内部API返回】资源长Id + - **Zone** (str) - 可用区 + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.DescribeCompShareInstanceRequestSchema().dumps(d) + + resp = self.invoke("DescribeCompShareInstance", d, **kwargs) + return apis.DescribeCompShareInstanceResponseSchema().loads(resp) + def describe_ul_host_bundles( self, req: typing.Optional[dict] = None, **kwargs ) -> dict: @@ -117,6 +235,7 @@ def describe_ul_host_instance( - **ChargeType** (str) - 计费模式。枚举值:Month/Year - **CreateTime** (int) - 创建时间。Unix时间戳 - **DiskSet** (list) - 见 **ULHostDiskSet** 模型定义 + - **ExclusiveUTPInfo** (dict) - 见 **ExclusiveUTPInfo** 模型定义 - **ExpireTime** (int) - 过期时间。Unix时间戳 - **IPSet** (list) - 见 **UHostIPSet** 模型定义 - **ImageId** (str) - 镜像Id。 @@ -154,6 +273,16 @@ def describe_ul_host_instance( - **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。 + **ExclusiveUTPInfo** + - **AvailableSize** (int) - 当前周期剩余流量 + - **CreateTime** (int) - 创建时间 + - **ExcessSize** (int) - 当前周期超出限额的流量 + - **LastResetTime** (int) - 上次重置时间 + - **NextResetTime** (int) - 下次重置时间 + - **TotalSize** (int) - 当前周期总流量 + - **UsedSize** (int) - 当前周期已使用流量 + + """ # build request d = { @@ -335,7 +464,7 @@ def reinstall_ul_host_instance( - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ - **ImageId** (str) - (Required) 镜像Id。暂不支持使用自定义镜像重装 - - **Password** (str) - (Required) 登陆密码 + - **Password** (str) - (Required) 登陆密码。密码需使用base64进行编码,举例如下:# echo -n Password1 | base64UGFzc3dvcmQx - **ULHostId** (str) - (Required) 实例Id **Response** @@ -383,6 +512,34 @@ def reset_ul_host_instance_password( resp = self.invoke("ResetULHostInstancePassword", d, **kwargs) return apis.ResetULHostInstancePasswordResponseSchema().loads(resp) + def start_comp_share_instance( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """StartCompShareInstance - 启动算力平台实例 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **UHostId** (str) - (Required) 实例Id + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + - **UHostId** (str) - 实例Id + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.StartCompShareInstanceRequestSchema().dumps(d) + + resp = self.invoke("StartCompShareInstance", d, **kwargs) + return apis.StartCompShareInstanceResponseSchema().loads(resp) + def start_ul_host_instance( self, req: typing.Optional[dict] = None, **kwargs ) -> dict: @@ -410,6 +567,34 @@ def start_ul_host_instance( resp = self.invoke("StartULHostInstance", d, **kwargs) return apis.StartULHostInstanceResponseSchema().loads(resp) + def stop_comp_share_instance( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """StopCompShareInstance - 关闭算力平台实例 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **UHostId** (str) - (Required) 实例Id + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + - **UHostId** (str) - 实例Id + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.StopCompShareInstanceRequestSchema().dumps(d) + + resp = self.invoke("StopCompShareInstance", d, **kwargs) + return apis.StopCompShareInstanceResponseSchema().loads(resp) + def stop_ul_host_instance( self, req: typing.Optional[dict] = None, **kwargs ) -> dict: diff --git a/ucloud/services/ucompshare/schemas/apis.py b/ucloud/services/ucompshare/schemas/apis.py index 9306fa69..4174e005 100644 --- a/ucloud/services/ucompshare/schemas/apis.py +++ b/ucloud/services/ucompshare/schemas/apis.py @@ -28,6 +28,11 @@ class CreateULHostInstanceRequestSchema(schema.RequestSchema): "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), + "SecurityGroupId": fields.Str( + required=False, dump_to="SecurityGroupId" + ), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), } @@ -40,6 +45,39 @@ class CreateULHostInstanceResponseSchema(schema.ResponseSchema): } +""" +API: DescribeCompShareInstance + +获取用户所有地域下主机资源信息列表 +""" + + +class DescribeCompShareInstanceRequestSchema(schema.RequestSchema): + """DescribeCompShareInstance - 获取用户所有地域下主机资源信息列表""" + + fields = { + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), + "UHostIds": fields.List(fields.Str()), + "Zone": fields.Str(required=False, dump_to="Zone"), + } + + +class DescribeCompShareInstanceResponseSchema(schema.ResponseSchema): + """DescribeCompShareInstance - 获取用户所有地域下主机资源信息列表""" + + fields = { + "TotalCount": fields.Int(required=True, load_from="TotalCount"), + "UHostSet": fields.List( + models.CompShareInstanceSetSchema(), + required=True, + load_from="UHostSet", + ), + } + + """ API: DescribeULHostBundles @@ -290,6 +328,32 @@ class ResetULHostInstancePasswordResponseSchema(schema.ResponseSchema): } +""" +API: StartCompShareInstance + +启动算力平台实例 +""" + + +class StartCompShareInstanceRequestSchema(schema.RequestSchema): + """StartCompShareInstance - 启动算力平台实例""" + + fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class StartCompShareInstanceResponseSchema(schema.ResponseSchema): + """StartCompShareInstance - 启动算力平台实例""" + + fields = { + "UHostId": fields.Str(required=True, load_from="UHostId"), + } + + """ API: StartULHostInstance @@ -315,6 +379,32 @@ class StartULHostInstanceResponseSchema(schema.ResponseSchema): } +""" +API: StopCompShareInstance + +关闭算力平台实例 +""" + + +class StopCompShareInstanceRequestSchema(schema.RequestSchema): + """StopCompShareInstance - 关闭算力平台实例""" + + fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class StopCompShareInstanceResponseSchema(schema.ResponseSchema): + """StopCompShareInstance - 关闭算力平台实例""" + + fields = { + "UHostId": fields.Str(required=True, load_from="UHostId"), + } + + """ API: StopULHostInstance diff --git a/ucloud/services/ucompshare/schemas/models.py b/ucloud/services/ucompshare/schemas/models.py index c23070a9..4e46cc86 100644 --- a/ucloud/services/ucompshare/schemas/models.py +++ b/ucloud/services/ucompshare/schemas/models.py @@ -3,19 +3,6 @@ from ucloud.core.typesystem import schema, fields -class BundleSchema(schema.ResponseSchema): - """Bundle - 轻量应用云主机套餐""" - - fields = { - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "BundleId": fields.Str(required=False, load_from="BundleId"), - "CPU": fields.Int(required=False, load_from="CPU"), - "Memory": fields.Int(required=False, load_from="Memory"), - "SysDiskSpace": fields.Int(required=False, load_from="SysDiskSpace"), - "TrafficPacket": fields.Int(required=False, load_from="TrafficPacket"), - } - - class UHostIPSetSchema(schema.ResponseSchema): """UHostIPSet -""" @@ -36,6 +23,125 @@ class UHostIPSetSchema(schema.ResponseSchema): } +class GraphicsMemorySchema(schema.ResponseSchema): + """GraphicsMemory - GPU的显存指标""" + + fields = { + "Rate": fields.Int(required=False, load_from="Rate"), + "Value": fields.Int(required=False, load_from="Value"), + } + + +class SoftwareAddrSchema(schema.ResponseSchema): + """SoftwareAddr -""" + + fields = { + "Name": fields.Str(required=False, load_from="Name"), + "URL": fields.Str(required=False, load_from="URL"), + } + + +class UHostDiskSetSchema(schema.ResponseSchema): + """UHostDiskSet -""" + + fields = { + "BackupType": fields.Str(required=False, load_from="BackupType"), + "DiskId": fields.Str(required=False, load_from="DiskId"), + "DiskType": fields.Str(required=True, load_from="DiskType"), + "Drive": fields.Str(required=False, load_from="Drive"), + "Encrypted": fields.Str(required=False, load_from="Encrypted"), + "IsBoot": fields.Str(required=True, load_from="IsBoot"), + "Name": fields.Str(required=False, load_from="Name"), + "Size": fields.Int(required=False, load_from="Size"), + "Type": fields.Str(required=False, load_from="Type"), + } + + +class CompShareInstanceSetSchema(schema.ResponseSchema): + """CompShareInstanceSet - 算力平台实例详情""" + + fields = { + "AutoRenew": fields.Str(required=False, load_from="AutoRenew"), + "CPU": fields.Int(required=False, load_from="CPU"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "CompShareImageBillId": fields.Str( + required=False, load_from="CompShareImageBillId" + ), + "CompShareImageId": fields.Str( + required=False, load_from="CompShareImageId" + ), + "CompShareImageName": fields.Str( + required=False, load_from="CompShareImageName" + ), + "CompShareImageOwnerAlias": fields.Str( + required=False, load_from="CompShareImageOwnerAlias" + ), + "CompShareImagePrice": fields.Float( + required=False, load_from="CompShareImagePrice" + ), + "CompShareImageStatus": fields.Str( + required=False, load_from="CompShareImageStatus" + ), + "CompShareImageType": fields.Str( + required=False, load_from="CompShareImageType" + ), + "CpuArch": fields.Str(required=False, load_from="CpuArch"), + "CpuPlatform": fields.Str(required=False, load_from="CpuPlatform"), + "CreateTime": fields.Str(required=False, load_from="CreateTime"), + "DiskSet": fields.List(UHostDiskSetSchema()), + "ExpireTime": fields.Str(required=False, load_from="ExpireTime"), + "GPU": fields.Int(required=False, load_from="GPU"), + "GpuType": fields.Str(required=False, load_from="GpuType"), + "GraphicsMemory": GraphicsMemorySchema(), + "HostIp": fields.Str(required=False, load_from="HostIp"), + "HugepageCfg": fields.Str(required=False, load_from="HugepageCfg"), + "IPSet": fields.List(UHostIPSetSchema()), + "InstancePrice": fields.Float( + required=False, load_from="InstancePrice" + ), + "InstanceType": fields.Str(required=False, load_from="InstanceType"), + "IsExpire": fields.Str(required=False, load_from="IsExpire"), + "MachineType": fields.Str(required=False, load_from="MachineType"), + "Memory": fields.Str(required=False, load_from="Memory"), + "Name": fields.Str(required=False, load_from="Name"), + "OsName": fields.Str(required=False, load_from="OsName"), + "OsType": fields.Str(required=False, load_from="OsType"), + "Password": fields.Str(required=False, load_from="Password"), + "PodId": fields.Str(required=False, load_from="PodId"), + "PostPayShutdown": fields.Bool( + required=False, load_from="PostPayShutdown" + ), + "QemuFullVersion": fields.Str( + required=False, load_from="QemuFullVersion" + ), + "QemuVersion": fields.Str(required=False, load_from="QemuVersion"), + "Remark": fields.Str(required=False, load_from="Remark"), + "SetId": fields.Int(required=False, load_from="SetId"), + "Softwares": fields.List(SoftwareAddrSchema()), + "State": fields.Str(required=False, load_from="State"), + "Tag": fields.Str(required=False, load_from="Tag"), + "TotalDiskSpace": fields.Int( + required=False, load_from="TotalDiskSpace" + ), + "UHostId": fields.Str(required=False, load_from="UHostId"), + "UUID": fields.Str(required=False, load_from="UUID"), + "Zone": fields.Str(required=False, load_from="Zone"), + } + + +class BundleSchema(schema.ResponseSchema): + """Bundle - 轻量应用云主机套餐""" + + fields = { + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "BundleId": fields.Str(required=False, load_from="BundleId"), + "CPU": fields.Int(required=False, load_from="CPU"), + "Memory": fields.Int(required=False, load_from="Memory"), + "SysDiskSpace": fields.Int(required=False, load_from="SysDiskSpace"), + "TrafficPacket": fields.Int(required=False, load_from="TrafficPacket"), + } + + class ULHostDiskSetSchema(schema.ResponseSchema): """ULHostDiskSet - 轻量应用主机的磁盘信息""" @@ -49,6 +155,20 @@ class ULHostDiskSetSchema(schema.ResponseSchema): } +class ExclusiveUTPInfoSchema(schema.ResponseSchema): + """ExclusiveUTPInfo - 流量包详情""" + + fields = { + "AvailableSize": fields.Int(required=False, load_from="AvailableSize"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "ExcessSize": fields.Int(required=False, load_from="ExcessSize"), + "LastResetTime": fields.Int(required=False, load_from="LastResetTime"), + "NextResetTime": fields.Int(required=False, load_from="NextResetTime"), + "TotalSize": fields.Int(required=False, load_from="TotalSize"), + "UsedSize": fields.Int(required=False, load_from="UsedSize"), + } + + class ULHostInstanceSetSchema(schema.ResponseSchema): """ULHostInstanceSet - 轻量应用云主机详情""" @@ -59,6 +179,7 @@ class ULHostInstanceSetSchema(schema.ResponseSchema): "ChargeType": fields.Str(required=False, load_from="ChargeType"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), "DiskSet": fields.List(ULHostDiskSetSchema()), + "ExclusiveUTPInfo": ExclusiveUTPInfoSchema(), "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "IPSet": fields.List(UHostIPSetSchema()), "ImageId": fields.Str(required=False, load_from="ImageId"), diff --git a/ucloud/services/udb/schemas/models.py b/ucloud/services/udb/schemas/models.py index e388096d..915689af 100644 --- a/ucloud/services/udb/schemas/models.py +++ b/ucloud/services/udb/schemas/models.py @@ -78,24 +78,6 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema): } -class MongoDBShardedClusterSetSchema(schema.ResponseSchema): - """MongoDBShardedClusterSet -""" - - fields = { - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "DBId": fields.Str(required=False, load_from="DBId"), - "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), - "MongosCount": fields.Int(required=False, load_from="MongosCount"), - "Name": fields.Str(required=False, load_from="Name"), - "ShardsrvCount": fields.Int(required=False, load_from="ShardsrvCount"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "Tag": fields.Str(required=False, load_from="Tag"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "VirtualIPs": fields.List(fields.Str()), - "Zone": fields.Str(required=False, load_from="Zone"), - } - - class UDBInstanceSetSchema(schema.ResponseSchema): """UDBInstanceSet - DescribeUDBInstance""" @@ -170,6 +152,24 @@ class UDBInstanceSetSchema(schema.ResponseSchema): } +class MongoDBShardedClusterSetSchema(schema.ResponseSchema): + """MongoDBShardedClusterSet -""" + + fields = { + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "DBId": fields.Str(required=False, load_from="DBId"), + "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), + "MongosCount": fields.Int(required=False, load_from="MongosCount"), + "Name": fields.Str(required=False, load_from="Name"), + "ShardsrvCount": fields.Int(required=False, load_from="ShardsrvCount"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "Tag": fields.Str(required=False, load_from="Tag"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "VirtualIPs": fields.List(fields.Str()), + "Zone": fields.Str(required=False, load_from="Zone"), + } + + class UDBBackupSetSchema(schema.ResponseSchema): """UDBBackupSet - DescribeUDBBackup""" diff --git a/ucloud/services/uhost/schemas/models.py b/ucloud/services/uhost/schemas/models.py index ede9eba0..9431751b 100644 --- a/ucloud/services/uhost/schemas/models.py +++ b/ucloud/services/uhost/schemas/models.py @@ -40,16 +40,6 @@ class CollectionSchema(schema.ResponseSchema): } -class FeatureModesSchema(schema.ResponseSchema): - """FeatureModes - 可以支持的模式类别""" - - fields = { - "MinimalCpuPlatform": fields.List(fields.Str()), - "Name": fields.Str(required=False, load_from="Name"), - "RelatedToImageFeature": fields.List(fields.Str()), - } - - class DataDiskInfoSchema(schema.ResponseSchema): """DataDiskInfo - 数据盘信息""" @@ -72,6 +62,25 @@ class BootDiskInfoSchema(schema.ResponseSchema): } +class FeatureModesSchema(schema.ResponseSchema): + """FeatureModes - 可以支持的模式类别""" + + fields = { + "MinimalCpuPlatform": fields.List(fields.Str()), + "Name": fields.Str(required=False, load_from="Name"), + "RelatedToImageFeature": fields.List(fields.Str()), + } + + +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和内存信息""" @@ -90,11 +99,12 @@ class GraphicsMemorySchema(schema.ResponseSchema): } -class FeaturesSchema(schema.ResponseSchema): - """Features - 虚机可支持的特性""" +class DisksSchema(schema.ResponseSchema): + """Disks - 磁盘信息""" fields = { - "Modes": fields.List(FeatureModesSchema()), + "BootDisk": fields.List(BootDiskInfoSchema()), + "DataDisk": fields.List(DataDiskInfoSchema()), "Name": fields.Str(required=False, load_from="Name"), } @@ -109,21 +119,11 @@ 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 DisksSchema(schema.ResponseSchema): - """Disks - 磁盘信息""" +class FeaturesSchema(schema.ResponseSchema): + """Features - 虚机可支持的特性""" fields = { - "BootDisk": fields.List(BootDiskInfoSchema()), - "DataDisk": fields.List(DataDiskInfoSchema()), + "Modes": fields.List(FeatureModesSchema()), "Name": fields.Str(required=False, load_from="Name"), } @@ -213,13 +213,11 @@ class IsolationGroupSchema(schema.ResponseSchema): } -class UDSetUDHostAttributeSchema(schema.ResponseSchema): - """UDSetUDHostAttribute - 私有专区对应的宿主机属性""" +class SpotAttributeSchema(schema.ResponseSchema): + """SpotAttribute - 竞价实例属性""" 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"), + "RecycleTime": fields.Int(required=False, load_from="RecycleTime"), } @@ -243,6 +241,25 @@ class UHostIPSetSchema(schema.ResponseSchema): } +class UHostKeyPairSchema(schema.ResponseSchema): + """UHostKeyPair - 主机密钥信息""" + + fields = { + "KeyPairId": fields.Str(required=False, load_from="KeyPairId"), + "KeyPairState": fields.Str(required=False, load_from="KeyPairState"), + } + + +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 UHostDiskSetSchema(schema.ResponseSchema): """UHostDiskSet - DescribeUHostInstance""" @@ -259,23 +276,6 @@ class UHostDiskSetSchema(schema.ResponseSchema): } -class UHostKeyPairSchema(schema.ResponseSchema): - """UHostKeyPair - 主机密钥信息""" - - fields = { - "KeyPairId": fields.Str(required=False, load_from="KeyPairId"), - "KeyPairState": fields.Str(required=False, load_from="KeyPairState"), - } - - -class SpotAttributeSchema(schema.ResponseSchema): - """SpotAttribute - 竞价实例属性""" - - fields = { - "RecycleTime": fields.Int(required=False, load_from="RecycleTime"), - } - - class UHostInstanceSetSchema(schema.ResponseSchema): """UHostInstanceSet - DescribeUHostInstance""" diff --git a/ucloud/services/uk8s/schemas/models.py b/ucloud/services/uk8s/schemas/models.py index 271d6d79..33a16415 100644 --- a/ucloud/services/uk8s/schemas/models.py +++ b/ucloud/services/uk8s/schemas/models.py @@ -3,18 +3,6 @@ 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 - 节点磁盘信息""" @@ -32,6 +20,18 @@ 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 KubeProxySchema(schema.ResponseSchema): """KubeProxy - KubeProxy信息""" diff --git a/ucloud/services/umem/schemas/models.py b/ucloud/services/umem/schemas/models.py index 5ff3ae30..12cf4046 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/unet/schemas/models.py b/ucloud/services/unet/schemas/models.py index 2159139e..7086abc7 100644 --- a/ucloud/services/unet/schemas/models.py +++ b/ucloud/services/unet/schemas/models.py @@ -71,6 +71,16 @@ 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""" @@ -92,16 +102,6 @@ class UnetEIPResourceSetSchema(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 UnetEIPSetSchema(schema.ResponseSchema): """UnetEIPSet - DescribeEIP""" diff --git a/ucloud/version.py b/ucloud/version.py index 25882765..83e8f748 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.67" +version = "0.11.68"