diff --git a/ucloud/services/uhost/client.py b/ucloud/services/uhost/client.py index 8a4308a..9848977 100644 --- a/ucloud/services/uhost/client.py +++ b/ucloud/services/uhost/client.py @@ -80,10 +80,6 @@ def check_uhost_resource_capacity( **Request Model** - **CheckUHostResourceCapacityParamFeatures** - - **UNI** (bool) - 弹性网卡特性。开启了弹性网卡权限位，此特性才生效，默认 false 未开启，true 开启，仅与 NetCapability Normal 兼容。 - - **CheckUHostResourceCapacityParamDisksCustomBackup** - **Day** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以5天级为基础进行倍数扩增，如5、10、15、20、25、30。 - **Hour** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以24小时级为基础进行倍数扩增，如24、48、72、96。 @@ -101,6 +97,10 @@ def check_uhost_resource_capacity( - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + **CheckUHostResourceCapacityParamFeatures** + - **UNI** (bool) - 弹性网卡特性。开启了弹性网卡权限位，此特性才生效，默认 false 未开启，true 开启，仅与 NetCapability Normal 兼容。 + + """ # build request d = { @@ -284,23 +284,9 @@ def create_uhost_instance( **Request Model** - **CreateUHostInstanceParamDisksCustomBackup** - - **Day** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以5天级为基础进行倍数扩增，如5、10、15、20、25、30。 - - **Hour** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以24小时级为基础进行倍数扩增，如24、48、72、96。 - - **Journal** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以12小时秒级为基础进行倍数扩增，如12、24、36、48。 - - - **CreateUHostInstanceParamDisks** - - **BackupMode** (str) - 指定快照备份策略。当Disks.N.BackupType为"SNAPSHOT"时此参数生效。枚举值："Base"：标准版，"Ultimate"：旗舰版，"Custom"：自定义备份链；默认值："Base"。 - - **BackupType** (str) - 磁盘备份方案。枚举值：\\ > NONE，无备份 \\ > SNAPSHOT，快照 \\当前磁盘支持的备份模式参考 `磁盘类型 `_ ,默认值:NONE - - **CouponId** (str) - 云盘代金券id。不适用于系统盘/本地盘。请通过DescribeCoupon接口查询，或登录用户中心查看 - - **CustomBackup** (dict) - 见 **CreateUHostInstanceParamDisksCustomBackup** 模型定义 - - **Encrypted** (bool) - 【功能仅部分可用区开放，详询技术支持】磁盘是否加密。加密：true, 不加密: false加密必须传入对应的的KmsKeyId,默认值false - - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 - - **KmsKeyId** (str) - 【功能仅部分可用区开放，详询技术支持】kms key id。选择加密盘时必填。 - - **Size** (int) - 磁盘大小，单位GB。请参考 `磁盘类型 `_ 。 - - **SnapshotId** (str) - 从快照创建盘时所用快照id，目前仅支持数据盘 - - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + **CreateUHostInstanceParamLabels** + - **Key** (str) - 用户资源标签的键值 + - **Value** (str) - 用户资源标签的值 **CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH** @@ -312,6 +298,7 @@ def create_uhost_instance( **CreateUHostInstanceParamNetworkInterfaceEIP** - **Bandwidth** (int) - 【若绑定EIP，此参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式下非必传, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： 流量计费[1-300]，带宽计费[1-800] - **CouponId** (str) - 当前EIP代金券id。请通过DescribeCoupon接口查询，或登录用户中心查看。 + - **ExistEIPId** (str) - 指定EIP Id进行绑定 - **OperatorName** (str) - 【若绑定EIP，此参数必填】弹性IP的线路。枚举值: 国际: International BGP: Bgp 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: International kr-seoul:International us-ws:International ge-fra:International sg:International tw-kh:International.其他海外线路均为 International - **PayMode** (str) - 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. "Free":免费带宽模式,默认为 "Bandwidth" - **ShareBandwidthId** (str) - 绑定的共享带宽Id，仅当PayMode为ShareBandwidth时有效 @@ -321,17 +308,34 @@ def create_uhost_instance( - **Address** (str) - 第N个网卡对应的IPv6地址，默认不分配IPv6，“Auto”自动分配，不为空的其他字符串为实际要分配的IPv6地址。当前仅支持分配一个IPv6地址 - **CreateUHostInstanceParamLabels** - - **Key** (str) - 用户资源标签的键值 - - **Value** (str) - 用户资源标签的值 - - **CreateUHostInstanceParamNetworkInterface** - **CreateCernetIp** (bool) - 申请并绑定一个教育网EIP。True为申请并绑定，False为不会申请绑定，默认False。当前只支持具有HPC特性的机型。 - **EIP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIP** 模型定义 - **IPv6** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceIPv6** 模型定义 + **CreateUHostInstanceParamDisksCustomBackup** + - **Day** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以5天级为基础进行倍数扩增，如5、10、15、20、25、30。 + - **Hour** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以24小时级为基础进行倍数扩增，如24、48、72、96。 + - **Journal** (str) - Disks.N.BackupMode为"Custom"时，进行设置, 以12小时秒级为基础进行倍数扩增，如12、24、36、48。 + + + **CreateUHostInstanceParamVolumes** + + + **CreateUHostInstanceParamDisks** + - **BackupMode** (str) - 指定快照备份策略。当Disks.N.BackupType为"SNAPSHOT"时此参数生效。枚举值："Base"：标准版，"Ultimate"：旗舰版，"Custom"：自定义备份链；默认值："Base"。 + - **BackupType** (str) - 磁盘备份方案。枚举值：\\ > NONE，无备份 \\ > SNAPSHOT，快照 \\当前磁盘支持的备份模式参考 `磁盘类型 `_ ,默认值:NONE + - **CouponId** (str) - 云盘代金券id。不适用于系统盘/本地盘。请通过DescribeCoupon接口查询，或登录用户中心查看 + - **CustomBackup** (dict) - 见 **CreateUHostInstanceParamDisksCustomBackup** 模型定义 + - **Encrypted** (bool) - 【功能仅部分可用区开放，详询技术支持】磁盘是否加密。加密：true, 不加密: false加密必须传入对应的的KmsKeyId,默认值false + - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 + - **KmsKeyId** (str) - 【功能仅部分可用区开放，详询技术支持】kms key id。选择加密盘时必填。 + - **Size** (int) - 磁盘大小，单位GB。请参考 `磁盘类型 `_ 。 + - **SnapshotId** (str) - 从快照创建盘时所用快照id，目前仅支持数据盘 + - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + + **CreateUHostInstanceParamFeatures** - **UNI** (bool) - 弹性网卡特性。开启了弹性网卡权限位，此特性才生效，默认 false 未开启，true 开启。 @@ -341,9 +345,6 @@ def create_uhost_instance( - **Priority** (int) - 安全组优先级。取值范围[1, 5] - **CreateUHostInstanceParamVolumes** - - """ # build request d = { @@ -474,27 +475,61 @@ def describe_available_instance_types( **Response Model** + **FeatureModes** + - **MinimalCpuPlatform** (list) - 这个特性必须是列出来的CPU平台及以上的CPU才支持 + - **Name** (str) - 模式|特性名称 + - **RelatedToImageFeature** (list) - 为镜像上支持这个特性的标签。例如DescribeImage返回的字段Features包含HotPlug，说明该镜像支持热升级。 + + + **Features** + - **Modes** (list) - 见 **FeatureModes** 模型定义 + - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug + + + **CpuPlatforms** + - **Amd** (list) - 返回AMD的CPU平台信息，例如：AMD: ['Amd/Epyc2'] + - **Ampere** (list) - 返回Arm的CPU平台信息，例如：Ampere: ['Ampere/Altra'] + - **Intel** (list) - 返回Intel的CPU平台信息，例如：Intel: ['Intel/CascadeLake','Intel/CascadelakeR','Intel/IceLake'] + + + **Performance** + - **Rate** (int) - 交互展示参数，可忽略 + - **Value** (float) - 值，单位是TFlops + + **Collection** - **Cpu** (int) - CPU规格 - **Memory** (list) - 内存规格 - **MinimalCpuPlatform** (list) - CPU和内存规格只能在列出来的CPU平台支持 + **MachineSizes** + - **Collection** (list) - 见 **Collection** 模型定义 + - **Gpu** (int) - Gpu为GPU可支持的规格即GPU颗数，非GPU机型，Gpu为0 + + **CpuPlatformWithModels** - **CpuFrequency** (str) - CPU频率 - **CpuModels** (list) - CPU Model列表 - **Name** (str) - CPU平台 + **GraphicsMemory** + - **Rate** (int) - 交互展示参数，可忽略 + - **Value** (int) - 值，单位是GB + + **UHostFamily** - **CpuFrequency** (str) - CPU频率信息 - **CpuPlatforms** (list) - 见 **CpuPlatformWithModels** 模型定义 - **Name** (str) - 规格族 - **Performance** - - **Rate** (int) - 交互展示参数，可忽略 - - **Value** (float) - 值，单位是TFlops + **BootDiskInfo** + - **Features** (list) - 磁盘可支持的服务 + - **InstantResize** (bool) - 系统盘是否允许扩容，如果是本地盘，则不允许扩容，InstantResize为false。 + - **MaximalSize** (int) - MaximalSize为磁盘最大值 + - **Name** (str) - 系统盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 **DataDiskInfo** @@ -504,46 +539,12 @@ def describe_available_instance_types( - **Name** (str) - 数据盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 - **CpuPlatforms** - - **Amd** (list) - 返回AMD的CPU平台信息，例如：AMD: ['Amd/Epyc2'] - - **Ampere** (list) - 返回Arm的CPU平台信息，例如：Ampere: ['Ampere/Altra'] - - **Intel** (list) - 返回Intel的CPU平台信息，例如：Intel: ['Intel/CascadeLake','Intel/CascadelakeR','Intel/IceLake'] - - - **BootDiskInfo** - - **Features** (list) - 磁盘可支持的服务 - - **InstantResize** (bool) - 系统盘是否允许扩容，如果是本地盘，则不允许扩容，InstantResize为false。 - - **MaximalSize** (int) - MaximalSize为磁盘最大值 - - **Name** (str) - 系统盘类别，包含普通云盘|CLOUD_NORMAL、SSD云盘|CLOUD_SSD和RSSD云盘|CLOUD_RSSD。普通本地盘只包含普通本地盘|LOCAL_NORMAL一种。SSD本地盘只包含SSD本地盘|LOCAL_SSD一种。 - - **Disks** - **BootDisk** (list) - 见 **BootDiskInfo** 模型定义 - **DataDisk** (list) - 见 **DataDiskInfo** 模型定义 - **Name** (str) - 磁盘介质类别信息，磁盘主要分类如下：云盘|cloudDisk、普通本地盘|normalLocalDisk和SSD本地盘|ssdLocalDisk。 - **MachineSizes** - - **Collection** (list) - 见 **Collection** 模型定义 - - **Gpu** (int) - Gpu为GPU可支持的规格即GPU颗数，非GPU机型，Gpu为0 - - - **FeatureModes** - - **MinimalCpuPlatform** (list) - 这个特性必须是列出来的CPU平台及以上的CPU才支持 - - **Name** (str) - 模式|特性名称 - - **RelatedToImageFeature** (list) - 为镜像上支持这个特性的标签。例如DescribeImage返回的字段Features包含HotPlug，说明该镜像支持热升级。 - - - **Features** - - **Modes** (list) - 见 **FeatureModes** 模型定义 - - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug - - - **GraphicsMemory** - - **Rate** (int) - 交互展示参数，可忽略 - - **Value** (int) - 值，单位是GB - - **AvailableInstanceTypes** - **CpuPlatforms** (dict) - 见 **CpuPlatforms** 模型定义 - **Description** (str) - 机型描述 @@ -588,22 +589,6 @@ def describe_host_machine_type_families( **Response Model** - **GraphicsMemory** - - **Rate** (int) - 交互展示参数，可忽略 - - **Value** (int) - 值，单位是GB - - - **Performance** - - **Rate** (int) - 交互展示参数，可忽略 - - **Value** (float) - 值，单位是TFlops - - - **FamiliesGpuType** - - **GraphicsMemory** (dict) - 见 **GraphicsMemory** 模型定义 - - **Name** (str) - 机型名称 - - **Performance** (dict) - 见 **Performance** 模型定义 - - **CpuPlatformWithModels** - **CpuFrequency** (str) - CPU频率 - **CpuModels** (list) - CPU Model列表 @@ -616,13 +601,9 @@ def describe_host_machine_type_families( - **Name** (str) - 规格族 - **Frequency** - - **Value** (float) - 值 - - - **NameFrequency** - - **Frequency** (dict) - 见 **Frequency** 模型定义 - - **Name** (str) - 机型名称 + **CpuPlatformStatus** + - **Name** (str) - CPU平台 + - **OperationStatus** (str) - 运营Commpont Code **Collection** @@ -631,9 +612,9 @@ def describe_host_machine_type_families( - **MinimalCpuPlatform** (list) - CPU和内存规格只能在列出来的CPU平台支持 - **CpuPlatformStatus** - - **Name** (str) - CPU平台 - - **OperationStatus** (str) - 运营Commpont Code + **MachineSizes** + - **Collection** (list) - 见 **Collection** 模型定义 + - **Gpu** (int) - Gpu为GPU可支持的规格即GPU颗数，非GPU机型，Gpu为0 **FeatureModes** @@ -642,14 +623,13 @@ def describe_host_machine_type_families( - **RelatedToImageFeature** (list) - 为镜像上支持这个特性的标签。例如DescribeImage返回的字段Features包含HotPlug，说明该镜像支持热升级。 - **Features** - - **Modes** (list) - 见 **FeatureModes** 模型定义 - - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug + **Performance** + - **Rate** (int) - 交互展示参数，可忽略 + - **Value** (float) - 值，单位是TFlops - **MachineSizes** - - **Collection** (list) - 见 **Collection** 模型定义 - - **Gpu** (int) - Gpu为GPU可支持的规格即GPU颗数，非GPU机型，Gpu为0 + **Frequency** + - **Value** (float) - 值 **NameOperationStatus** @@ -662,6 +642,27 @@ def describe_host_machine_type_families( - **Name** (str) - 特性名称 + **Features** + - **Modes** (list) - 见 **FeatureModes** 模型定义 + - **Name** (str) - 可支持的特性名称。目前支持的特性网络增强|NetCapability、热升级|Hotplug + + + **GraphicsMemory** + - **Rate** (int) - 交互展示参数，可忽略 + - **Value** (int) - 值，单位是GB + + + **FamiliesGpuType** + - **GraphicsMemory** (dict) - 见 **GraphicsMemory** 模型定义 + - **Name** (str) - 机型名称 + - **Performance** (dict) - 见 **Performance** 模型定义 + + + **NameFrequency** + - **Frequency** (dict) - 见 **Frequency** 模型定义 + - **Name** (str) - 机型名称 + + **FamiliesBootDiskInfo** - **Features** (list) - 见 **DiskFeature** 模型定义 - **InstantResize** (bool) - 系统盘是否允许扩容，如果是本地盘，则不允许扩容，InstantResize为false。 @@ -909,6 +910,10 @@ def describe_uhost_instance( **Response Model** + **SpotAttribute** + - **RecycleTime** (int) - 回收时间 + + **UHostDiskSet** - **BackupType** (str) - 备份方案。若开通了数据方舟，则为DATAARK - **DiskId** (str) - 磁盘ID @@ -921,10 +926,9 @@ def describe_uhost_instance( - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk - **UDSetUDHostAttribute** - - **HostBinding** (bool) - 是否绑定私有专区宿主机 - - **UDHostId** (str) - 私有专区宿主机 - - **UDSetId** (str) - 私有专区 + **UHostKeyPair** + - **KeyPairId** (str) - 密钥对ID + - **KeyPairState** (str) - 主机密钥对状态，Normal 正常，Deleted 删除 **UHostIPSet** @@ -941,13 +945,10 @@ def describe_uhost_instance( - **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。 - **SpotAttribute** - - **RecycleTime** (int) - 回收时间 - - - **UHostKeyPair** - - **KeyPairId** (str) - 密钥对ID - - **KeyPairState** (str) - 主机密钥对状态，Normal 正常，Deleted 删除 + **UDSetUDHostAttribute** + - **HostBinding** (bool) - 是否绑定私有专区宿主机 + - **UDHostId** (str) - 私有专区宿主机 + - **UDSetId** (str) - 私有专区 **UHostInstanceSet** diff --git a/ucloud/services/uhost/schemas/apis.py b/ucloud/services/uhost/schemas/apis.py index 977d32d..ef74983 100644 --- a/ucloud/services/uhost/schemas/apis.py +++ b/ucloud/services/uhost/schemas/apis.py @@ -41,14 +41,6 @@ class AddUHostToIsolationGroupResponseSchema(schema.ResponseSchema): """ -class CheckUHostResourceCapacityParamFeaturesSchema(schema.RequestSchema): - """CheckUHostResourceCapacityParamFeatures -""" - - fields = { - "UNI": fields.Bool(required=False, dump_to="UNI"), - } - - class CheckUHostResourceCapacityParamDisksCustomBackupSchema( schema.RequestSchema ): @@ -78,6 +70,14 @@ class CheckUHostResourceCapacityParamDisksSchema(schema.RequestSchema): } +class CheckUHostResourceCapacityParamFeaturesSchema(schema.RequestSchema): + """CheckUHostResourceCapacityParamFeatures -""" + + fields = { + "UNI": fields.Bool(required=False, dump_to="UNI"), + } + + class CheckUHostResourceCapacityRequestSchema(schema.RequestSchema): """CheckUHostResourceCapacity - 主机创建资源余量检查""" @@ -230,32 +230,12 @@ class CreateIsolationGroupResponseSchema(schema.ResponseSchema): """ -class CreateUHostInstanceParamDisksCustomBackupSchema(schema.RequestSchema): - """CreateUHostInstanceParamDisksCustomBackup -""" - - fields = { - "Day": fields.Str(required=False, dump_to="Day"), - "Hour": fields.Str(required=False, dump_to="Hour"), - "Journal": fields.Str(required=False, dump_to="Journal"), - } - - -class CreateUHostInstanceParamDisksSchema(schema.RequestSchema): - """CreateUHostInstanceParamDisks -""" +class CreateUHostInstanceParamLabelsSchema(schema.RequestSchema): + """CreateUHostInstanceParamLabels -""" fields = { - "BackupMode": fields.Str(required=False, dump_to="BackupMode"), - "BackupType": fields.Str(required=False, dump_to="BackupType"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "CustomBackup": CreateUHostInstanceParamDisksCustomBackupSchema( - required=False, dump_to="CustomBackup" - ), - "Encrypted": fields.Bool(required=False, dump_to="Encrypted"), - "IsBoot": fields.Str(required=True, dump_to="IsBoot"), - "KmsKeyId": fields.Str(required=False, dump_to="KmsKeyId"), - "Size": fields.Int(required=True, dump_to="Size"), - "SnapshotId": fields.Str(required=False, dump_to="SnapshotId"), - "Type": fields.Str(required=True, dump_to="Type"), + "Key": fields.Str(required=False, dump_to="Key"), + "Value": fields.Str(required=False, dump_to="Value"), } @@ -277,6 +257,7 @@ class CreateUHostInstanceParamNetworkInterfaceEIPSchema(schema.RequestSchema): fields = { "Bandwidth": fields.Int(required=False, dump_to="Bandwidth"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "ExistEIPId": fields.Str(required=False, dump_to="ExistEIPId"), "GlobalSSH": CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSHSchema( required=False, dump_to="GlobalSSH" ), # Deprecated, will be removed at 1.0 @@ -299,15 +280,6 @@ class CreateUHostInstanceParamNetworkInterfaceIPv6Schema(schema.RequestSchema): } -class CreateUHostInstanceParamLabelsSchema(schema.RequestSchema): - """CreateUHostInstanceParamLabels -""" - - fields = { - "Key": fields.Str(required=False, dump_to="Key"), - "Value": fields.Str(required=False, dump_to="Value"), - } - - class CreateUHostInstanceParamNetworkInterfaceSchema(schema.RequestSchema): """CreateUHostInstanceParamNetworkInterface -""" @@ -322,6 +294,41 @@ class CreateUHostInstanceParamNetworkInterfaceSchema(schema.RequestSchema): } +class CreateUHostInstanceParamDisksCustomBackupSchema(schema.RequestSchema): + """CreateUHostInstanceParamDisksCustomBackup -""" + + fields = { + "Day": fields.Str(required=False, dump_to="Day"), + "Hour": fields.Str(required=False, dump_to="Hour"), + "Journal": fields.Str(required=False, dump_to="Journal"), + } + + +class CreateUHostInstanceParamVolumesSchema(schema.RequestSchema): + """CreateUHostInstanceParamVolumes -""" + + fields = {} + + +class CreateUHostInstanceParamDisksSchema(schema.RequestSchema): + """CreateUHostInstanceParamDisks -""" + + fields = { + "BackupMode": fields.Str(required=False, dump_to="BackupMode"), + "BackupType": fields.Str(required=False, dump_to="BackupType"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "CustomBackup": CreateUHostInstanceParamDisksCustomBackupSchema( + required=False, dump_to="CustomBackup" + ), + "Encrypted": fields.Bool(required=False, dump_to="Encrypted"), + "IsBoot": fields.Str(required=True, dump_to="IsBoot"), + "KmsKeyId": fields.Str(required=False, dump_to="KmsKeyId"), + "Size": fields.Int(required=True, dump_to="Size"), + "SnapshotId": fields.Str(required=False, dump_to="SnapshotId"), + "Type": fields.Str(required=True, dump_to="Type"), + } + + class CreateUHostInstanceParamFeaturesSchema(schema.RequestSchema): """CreateUHostInstanceParamFeatures -""" @@ -339,12 +346,6 @@ class CreateUHostInstanceParamSecGroupIdSchema(schema.RequestSchema): } -class CreateUHostInstanceParamVolumesSchema(schema.RequestSchema): - """CreateUHostInstanceParamVolumes -""" - - fields = {} - - class CreateUHostInstanceRequestSchema(schema.RequestSchema): """CreateUHostInstance - 创建UHost实例。""" diff --git a/ucloud/services/uhost/schemas/models.py b/ucloud/services/uhost/schemas/models.py index 6cbc565..61d4608 100644 --- a/ucloud/services/uhost/schemas/models.py +++ b/ucloud/services/uhost/schemas/models.py @@ -41,54 +41,51 @@ class BootDiskInfoSchema(schema.ResponseSchema): } -class DataDiskInfoSchema(schema.ResponseSchema): - """DataDiskInfo - 数据盘信息""" +class CpuPlatformWithModelsSchema(schema.ResponseSchema): + """CpuPlatformWithModels -""" fields = { - "BackupMode": fields.List(fields.Str()), - "Features": fields.List(fields.Str()), - "MaximalSize": fields.Int(required=False, load_from="MaximalSize"), - "MinimalSize": fields.Int(required=False, load_from="MinimalSize"), + "CpuFrequency": fields.Str(required=False, load_from="CpuFrequency"), + "CpuModels": fields.List(fields.Str()), "Name": fields.Str(required=False, load_from="Name"), } -class DisksSchema(schema.ResponseSchema): - """Disks - 磁盘信息""" +class CollectionSchema(schema.ResponseSchema): + """Collection - CPU和内存可支持的规格""" fields = { - "BootDisk": fields.List(BootDiskInfoSchema()), - "DataDisk": fields.List(DataDiskInfoSchema()), - "Name": fields.Str(required=False, load_from="Name"), + "Cpu": fields.Int(required=False, load_from="Cpu"), + "Memory": fields.List(fields.Int()), + "MinimalCpuPlatform": fields.List(fields.Str()), } -class GraphicsMemorySchema(schema.ResponseSchema): - """GraphicsMemory - GPU的显存指标""" +class FeatureModesSchema(schema.ResponseSchema): + """FeatureModes - 可以支持的模式类别""" fields = { - "Rate": fields.Int(required=False, load_from="Rate"), - "Value": fields.Int(required=False, load_from="Value"), + "MinimalCpuPlatform": fields.List(fields.Str()), + "Name": fields.Str(required=False, load_from="Name"), + "RelatedToImageFeature": fields.List(fields.Str()), } -class CpuPlatformWithModelsSchema(schema.ResponseSchema): - """CpuPlatformWithModels -""" +class MachineSizesSchema(schema.ResponseSchema): + """MachineSizes - GPU、CPU和内存信息""" fields = { - "CpuFrequency": fields.Str(required=False, load_from="CpuFrequency"), - "CpuModels": fields.List(fields.Str()), - "Name": fields.Str(required=False, load_from="Name"), + "Collection": fields.List(CollectionSchema()), + "Gpu": fields.Int(required=False, load_from="Gpu"), } -class UHostFamilySchema(schema.ResponseSchema): - """UHostFamily -""" +class PerformanceSchema(schema.ResponseSchema): + """Performance - GPU的性能指标""" fields = { - "CpuFrequency": fields.Str(required=False, load_from="CpuFrequency"), - "CpuPlatforms": fields.List(CpuPlatformWithModelsSchema()), - "Name": fields.Str(required=False, load_from="Name"), + "Rate": fields.Int(required=False, load_from="Rate"), + "Value": fields.Float(required=False, load_from="Value"), } @@ -102,50 +99,53 @@ class CpuPlatformsSchema(schema.ResponseSchema): } -class FeatureModesSchema(schema.ResponseSchema): - """FeatureModes - 可以支持的模式类别""" +class FeaturesSchema(schema.ResponseSchema): + """Features - 虚机可支持的特性""" fields = { - "MinimalCpuPlatform": fields.List(fields.Str()), + "Modes": fields.List(FeatureModesSchema()), "Name": fields.Str(required=False, load_from="Name"), - "RelatedToImageFeature": fields.List(fields.Str()), } -class CollectionSchema(schema.ResponseSchema): - """Collection - CPU和内存可支持的规格""" +class GraphicsMemorySchema(schema.ResponseSchema): + """GraphicsMemory - GPU的显存指标""" fields = { - "Cpu": fields.Int(required=False, load_from="Cpu"), - "Memory": fields.List(fields.Int()), - "MinimalCpuPlatform": fields.List(fields.Str()), + "Rate": fields.Int(required=False, load_from="Rate"), + "Value": fields.Int(required=False, load_from="Value"), } -class PerformanceSchema(schema.ResponseSchema): - """Performance - GPU的性能指标""" +class DataDiskInfoSchema(schema.ResponseSchema): + """DataDiskInfo - 数据盘信息""" fields = { - "Rate": fields.Int(required=False, load_from="Rate"), - "Value": fields.Float(required=False, load_from="Value"), + "BackupMode": fields.List(fields.Str()), + "Features": fields.List(fields.Str()), + "MaximalSize": fields.Int(required=False, load_from="MaximalSize"), + "MinimalSize": fields.Int(required=False, load_from="MinimalSize"), + "Name": fields.Str(required=False, load_from="Name"), } -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"), } -class MachineSizesSchema(schema.ResponseSchema): - """MachineSizes - GPU、CPU和内存信息""" +class UHostFamilySchema(schema.ResponseSchema): + """UHostFamily -""" fields = { - "Collection": fields.List(CollectionSchema()), - "Gpu": fields.Int(required=False, load_from="Gpu"), + "CpuFrequency": fields.Str(required=False, load_from="CpuFrequency"), + "CpuPlatforms": fields.List(CpuPlatformWithModelsSchema()), + "Name": fields.Str(required=False, load_from="Name"), } @@ -170,13 +170,14 @@ class AvailableInstanceTypesSchema(schema.ResponseSchema): } -class FamiliesGpuTypeSchema(schema.ResponseSchema): - """FamiliesGpuType -""" +class CpuPlatformStatusSchema(schema.ResponseSchema): + """CpuPlatformStatus -""" fields = { - "GraphicsMemory": GraphicsMemorySchema(), "Name": fields.Str(required=False, load_from="Name"), - "Performance": PerformanceSchema(), + "OperationStatus": fields.Str( + required=False, load_from="OperationStatus" + ), } @@ -211,6 +212,23 @@ class FamiliesBootDiskInfoSchema(schema.ResponseSchema): } +class FrequencySchema(schema.ResponseSchema): + """Frequency - 频率""" + + fields = { + "Value": fields.Float(required=False, load_from="Value"), + } + + +class NameFrequencySchema(schema.ResponseSchema): + """NameFrequency - 名称及频率""" + + fields = { + "Frequency": FrequencySchema(), + "Name": fields.Str(required=False, load_from="Name"), + } + + class FamiliesDataDiskInfoSchema(schema.ResponseSchema): """FamiliesDataDiskInfo - 数据盘信息""" @@ -235,31 +253,13 @@ class FamiliesDisksSchema(schema.ResponseSchema): } -class CpuPlatformStatusSchema(schema.ResponseSchema): - """CpuPlatformStatus -""" - - fields = { - "Name": fields.Str(required=False, load_from="Name"), - "OperationStatus": fields.Str( - required=False, load_from="OperationStatus" - ), - } - - -class FrequencySchema(schema.ResponseSchema): - """Frequency - 频率""" - - fields = { - "Value": fields.Float(required=False, load_from="Value"), - } - - -class NameFrequencySchema(schema.ResponseSchema): - """NameFrequency - 名称及频率""" +class FamiliesGpuTypeSchema(schema.ResponseSchema): + """FamiliesGpuType -""" fields = { - "Frequency": FrequencySchema(), + "GraphicsMemory": GraphicsMemorySchema(), "Name": fields.Str(required=False, load_from="Name"), + "Performance": PerformanceSchema(), } @@ -364,24 +364,6 @@ class AvailableDiskTypesSchema(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 - 竞价实例属性""" - - fields = { - "RecycleTime": fields.Int(required=False, load_from="RecycleTime"), - } - - class UHostIPSetSchema(schema.ResponseSchema): """UHostIPSet - DescribeUHostInstance""" @@ -402,6 +384,24 @@ class UHostIPSetSchema(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 - 竞价实例属性""" + + fields = { + "RecycleTime": fields.Int(required=False, load_from="RecycleTime"), + } + + class UHostDiskSetSchema(schema.ResponseSchema): """UHostDiskSet - DescribeUHostInstance""" diff --git a/ucloud/version.py b/ucloud/version.py index 5918e2d..777a80a 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.133" +version = "0.11.134"