Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

sdk: rolling update for 0.11.69 #275

Merged
merged 1 commit into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions ucloud/services/pathx/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,13 @@ class SrcAreaInfoSchema(schema.ResponseSchema):
}


class OutPublicIpInfoSchema(schema.ResponseSchema):
"""OutPublicIpInfo - 线路回源IP信息"""
class ForwardTaskSchema(schema.ResponseSchema):
"""ForwardTask -"""

fields = {
"Area": fields.Str(required=False, load_from="Area"),
"IP": fields.Str(required=False, load_from="IP"),
"Port": fields.Int(required=True, load_from="Port"),
"Protocol": fields.Str(required=True, load_from="Protocol"),
"RSPort": fields.Int(required=True, load_from="RSPort"),
}


Expand All @@ -155,13 +156,12 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
}


class ForwardTaskSchema(schema.ResponseSchema):
"""ForwardTask -"""
class OutPublicIpInfoSchema(schema.ResponseSchema):
"""OutPublicIpInfo - 线路回源IP信息"""

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"),
"Area": fields.Str(required=False, load_from="Area"),
"IP": fields.Str(required=False, load_from="IP"),
}


Expand Down Expand Up @@ -246,15 +246,12 @@ class UPathSetSchema(schema.ResponseSchema):
}


class UGAL7ForwarderSchema(schema.ResponseSchema):
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
class UGAATaskSchema(schema.ResponseSchema):
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""

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"),
"SSLId": fields.Str(required=False, load_from="SSLId"),
"SSLName": fields.Str(required=False, load_from="SSLName"),
}


Expand All @@ -268,12 +265,15 @@ class UGAL4ForwarderSchema(schema.ResponseSchema):
}


class UGAATaskSchema(schema.ResponseSchema):
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
class UGAL7ForwarderSchema(schema.ResponseSchema):
"""UGAL7Forwarder - UGA实例 7层转发器信息"""

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"),
"SSLId": fields.Str(required=False, load_from="SSLId"),
"SSLName": fields.Str(required=False, load_from="SSLName"),
}


Expand Down Expand Up @@ -342,16 +342,6 @@ class AlarmRulerSchema(schema.ResponseSchema):
}


class TrafficDailySchema(schema.ResponseSchema):
"""TrafficDaily -"""

fields = {
"BillingState": fields.Str(required=True, load_from="BillingState"),
"Date": fields.Int(required=True, load_from="Date"),
"Traffic": fields.Int(required=True, load_from="Traffic"),
}


class TrafficDailyRecentlySchema(schema.ResponseSchema):
"""TrafficDailyRecently - 最近3个月日流量统计"""

Expand All @@ -362,6 +352,16 @@ class TrafficDailyRecentlySchema(schema.ResponseSchema):
}


class TrafficDailySchema(schema.ResponseSchema):
"""TrafficDaily -"""

fields = {
"BillingState": fields.Str(required=True, load_from="BillingState"),
"Date": fields.Int(required=True, load_from="Date"),
"Traffic": fields.Int(required=True, load_from="Traffic"),
}


class MatricPointSchema(schema.ResponseSchema):
"""MatricPoint -"""

Expand Down
46 changes: 23 additions & 23 deletions ucloud/services/ucdn/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,29 +339,6 @@ class CacheAllConfigSchema(schema.ResponseSchema):
}


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

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


class AdvancedConfSchema(schema.ResponseSchema):
"""AdvancedConf - 域名高级配置"""

fields = {
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
"HttpClientHeader": fields.List(fields.Str()),
"HttpOriginHeader": fields.List(fields.Str()),
"QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
"WebSocketEnable": fields.Bool(
required=False, load_from="WebSocketEnable"
),
}


class OriginConfSchema(schema.ResponseSchema):
"""OriginConf - 回源配置"""

Expand Down Expand Up @@ -391,6 +368,29 @@ class OriginConfSchema(schema.ResponseSchema):
}


class AdvancedConfSchema(schema.ResponseSchema):
"""AdvancedConf - 域名高级配置"""

fields = {
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
"HttpClientHeader": fields.List(fields.Str()),
"HttpOriginHeader": fields.List(fields.Str()),
"QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
"WebSocketEnable": fields.Bool(
required=False, load_from="WebSocketEnable"
),
}


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

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


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

Expand Down
122 changes: 76 additions & 46 deletions ucloud/services/ucompshare/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,42 +76,6 @@ def describe_comp_share_instance(

**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) - 磁盘类型。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。
- **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核数,单位: 个
Expand Down Expand Up @@ -158,6 +122,42 @@ def describe_comp_share_instance(
- **Zone** (str) - 可用区


**UHostDiskSet**
- **BackupType** (str) - 备份方案。若开通了数据方舟,则为DATAARK
- **DiskId** (str) - 磁盘ID
- **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。
- **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


**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。


**SoftwareAddr**
- **Name** (str) - 软件名称
- **URL** (str) - 软件地址


"""
# build request
d = {
Expand Down Expand Up @@ -259,6 +259,16 @@ def describe_ul_host_instance(
- **Type** (str) - 磁盘类型。系统盘:"Boot";数据盘:"Data"


**ExclusiveUTPInfo**
- **AvailableSize** (int) - 当前周期剩余流量
- **CreateTime** (int) - 创建时间
- **ExcessSize** (int) - 当前周期超出限额的流量
- **LastResetTime** (int) - 上次重置时间
- **NextResetTime** (int) - 下次重置时间
- **TotalSize** (int) - 当前周期总流量
- **UsedSize** (int) - 当前周期已使用流量


**UHostIPSet**
- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
- **Default** (str) - 内网 Private 类型下,表示是否为默认网卡。true: 是默认网卡;其他值:不是。
Expand All @@ -273,16 +283,6 @@ 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 = {
Expand Down Expand Up @@ -454,6 +454,36 @@ def reboot_ul_host_instance(
resp = self.invoke("RebootULHostInstance", d, **kwargs)
return apis.RebootULHostInstanceResponseSchema().loads(resp)

def reinstall_comp_share_instance(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
"""ReinstallCompShareInstance - 重装算力平台实例

**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **CompShareImageId** (str) - (Required) 镜像Id
- **Password** (str) - (Required) 实例的新密码
- **UHostId** (str) - (Required) 实例Id
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_

**Response**

- **UHostId** (str) - 实例Id

"""
# build request
d = {
"ProjectId": self.config.project_id,
"Region": self.config.region,
}
req and d.update(req)
d = apis.ReinstallCompShareInstanceRequestSchema().dumps(d)

resp = self.invoke("ReinstallCompShareInstance", d, **kwargs)
return apis.ReinstallCompShareInstanceResponseSchema().loads(resp)

def reinstall_ul_host_instance(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
Expand Down
30 changes: 30 additions & 0 deletions ucloud/services/ucompshare/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,36 @@ class RebootULHostInstanceResponseSchema(schema.ResponseSchema):
}


"""
API: ReinstallCompShareInstance

重装算力平台实例
"""


class ReinstallCompShareInstanceRequestSchema(schema.RequestSchema):
"""ReinstallCompShareInstance - 重装算力平台实例"""

fields = {
"CompShareImageId": fields.Str(
required=True, dump_to="CompShareImageId"
),
"Password": fields.Str(required=True, dump_to="Password"),
"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 ReinstallCompShareInstanceResponseSchema(schema.ResponseSchema):
"""ReinstallCompShareInstance - 重装算力平台实例"""

fields = {
"UHostId": fields.Str(required=True, load_from="UHostId"),
}


"""
API: ReinstallULHostInstance

Expand Down
26 changes: 13 additions & 13 deletions ucloud/services/ucompshare/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,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 ExclusiveUTPInfoSchema(schema.ResponseSchema):
"""ExclusiveUTPInfo - 流量包详情"""

Expand All @@ -169,6 +156,19 @@ class ExclusiveUTPInfoSchema(schema.ResponseSchema):
}


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

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


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

Expand Down
Loading