Skip to content
Open
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
762fdd6
add model folder
yufeiminds Sep 23, 2019
bdd5712
add model folder
yufeiminds Sep 23, 2019
5a146a2
Merge pull request #4 from yufeiminds/faeture/auto-release
ucloud-bot Sep 23, 2019
7f234ab
update template
yufeiminds Sep 23, 2019
457e9ec
auto release by sdk team
ucloud-bot Sep 24, 2019
ce82fec
auto release by sdk team
ucloud-bot Sep 24, 2019
058ca31
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
c37c0ad
auto release by sdk team
ucloud-bot Sep 24, 2019
e83bf54
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
b2ad8c0
auto release by sdk team
ucloud-bot Sep 24, 2019
2730289
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
68ea031
auto release by sdk team
ucloud-bot Sep 24, 2019
be29814
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
402ef4f
auto release by sdk team
ucloud-bot Sep 24, 2019
21dae2c
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
7f07db6
auto release by sdk team
ucloud-bot Sep 24, 2019
2190021
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
7c722f4
auto release by sdk team
ucloud-bot Sep 24, 2019
3a243f5
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
901bc4b
auto release by sdk team
ucloud-bot Sep 24, 2019
6181982
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
511d797
fix version
ucloud-bot Sep 24, 2019
e80af02
auto release by sdk team
ucloud-bot Sep 25, 2019
f734b70
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
59b2ff7
auto release by sdk team
ucloud-bot Sep 25, 2019
bd1be88
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
f1a6e1f
auto release by sdk team
ucloud-bot Sep 25, 2019
2ff0433
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
f09fea2
auto release by sdk team
ucloud-bot Sep 25, 2019
0e66412
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
847b6b0
auto release by sdk team
ucloud-bot Sep 26, 2019
96785ca
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
703b1f2
fix version
ucloud-bot Sep 26, 2019
df6456e
auto release by sdk team
ucloud-bot Sep 26, 2019
247bfa2
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
641b23e
auto release by sdk team
ucloud-bot Sep 26, 2019
109cd4d
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ucloud/services/stepflow/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ def get_sf_workflow_template(

**Response Model**

**Param**

- **Name** (str) - 参数名称
- **Type** (str) - 参数类型
- **Value** (str) - 参数值

**ActivityTemplate**

- **Input** (dict) - Activity的输入
Expand All @@ -76,12 +82,6 @@ def get_sf_workflow_template(
- **Timeout** (str) - Activity的超时时间
- **Type** (str) - Activity的类型

**Param**

- **Name** (str) - 参数名称
- **Type** (str) - 参数类型
- **Value** (str) - 参数值

**WorkflowTemplate**

- **Activites** (list) - 见 **ActivityTemplate** 模型定义
Expand Down
20 changes: 10 additions & 10 deletions ucloud/services/stepflow/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
from ucloud.core.typesystem import schema, fields


class ActivityTemplateSchema(schema.ResponseSchema):
""" ActivityTemplate - 工作流的Activity定义
class ParamSchema(schema.ResponseSchema):
""" Param - 工作流参数
"""

fields = {
"Input": fields.Str(),
"Name": fields.Str(required=False, load_from="Name"),
"Next": fields.Str(required=False, load_from="Next"),
"Output": fields.List(fields.Str()),
"RetryTimes": fields.Str(required=False, load_from="RetryTimes"),
"Timeout": fields.Str(required=False, load_from="Timeout"),
"Type": fields.Str(required=False, load_from="Type"),
"Value": fields.Str(required=False, load_from="Value"),
}


class ParamSchema(schema.ResponseSchema):
""" Param - 工作流参数
class ActivityTemplateSchema(schema.ResponseSchema):
""" ActivityTemplate - 工作流的Activity定义
"""

fields = {
"Input": fields.Str(),
"Name": fields.Str(required=False, load_from="Name"),
"Next": fields.Str(required=False, load_from="Next"),
"Output": fields.List(fields.Str()),
"RetryTimes": fields.Str(required=False, load_from="RetryTimes"),
"Timeout": fields.Str(required=False, load_from="Timeout"),
"Type": fields.Str(required=False, load_from="Type"),
"Value": fields.Str(required=False, load_from="Value"),
}


Expand Down
30 changes: 15 additions & 15 deletions ucloud/services/uhost/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ def create_uhost_instance(
- **PayMode** (str) - 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. "Free":免费带宽模式.默认为 "Bandwidth".
- **ShareBandwidthId** (str) - 绑定的共享带宽Id,仅当PayMode为ShareBandwidth时有效

**CreateUHostInstanceParamNetworkInterface**

- **EIP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIP** 模型定义
- **IP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceIP** 模型定义

**CreateUHostInstanceParamDisks**

- **BackupType** (str) - 磁盘备份方案。枚举值:\\ > NONE,无备份 \\ > DATAARK,数据方舟 \\ 当前磁盘支持的备份模式参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_
Expand All @@ -163,11 +168,6 @@ def create_uhost_instance(
- **Size** (int) - 磁盘大小,单位GB。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。
- **Type** (str) - 磁盘类型。请参考 `磁盘类型 <https://docs.ucloud.cn/api/uhost-api/disk_type>`_ 。

**CreateUHostInstanceParamNetworkInterface**

- **EIP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIP** 模型定义
- **IP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceIP** 模型定义

"""
# build request
d = {"ProjectId": self.config.project_id, "Region": self.config.region}
Expand Down Expand Up @@ -260,16 +260,6 @@ def describe_uhost_instance(

**Response Model**

**UHostIPSet**

- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
- **Default** (str) - 是否默认的弹性网卡的信息。true: 是默认弹性网卡;其他值:不是。
- **IP** (str) - IP地址
- **IPId** (str) - IP资源ID (内网IP无对应的资源ID)
- **SubnetId** (str) - IP地址对应的子网 ID(北京一当前字段为空)
- **Type** (str) - 国际: Internation,BGP: Bgp,内网: Private
- **VPCId** (str) - IP地址对应的VPC ID(北京一当前字段为空)

**UHostDiskSet**

- **BackupType** (str) - 备份方案。若开通了数据方舟,则为DataArk
Expand All @@ -282,6 +272,16 @@ def describe_uhost_instance(
- **Size** (int) - 磁盘大小,单位: GB
- **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot,数据盘: Data,网络盘:Udisk

**UHostIPSet**

- **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息)
- **Default** (str) - 是否默认的弹性网卡的信息。true: 是默认弹性网卡;其他值:不是。
- **IP** (str) - IP地址
- **IPId** (str) - IP资源ID (内网IP无对应的资源ID)
- **SubnetId** (str) - IP地址对应的子网 ID(北京一当前字段为空)
- **Type** (str) - 国际: Internation,BGP: Bgp,内网: Private
- **VPCId** (str) - IP地址对应的VPC ID(北京一当前字段为空)

**UHostInstanceSet**

- **AutoRenew** (str) - 是否自动续费,自动续费:“Yes”,不自动续费:“No”
Expand Down
46 changes: 23 additions & 23 deletions ucloud/services/ulb/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,23 +392,6 @@ def describe_ulb(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
- **PrivateIP** (str) - 后端资源的内网IP
- **ResourceName** (str) - 后端资源的实例名称

**ULBSSLSet**

- **HashValue** (str) -
- **SSLId** (str) - SSL证书的Id
- **SSLName** (str) - SSL证书的名字

**ULBPolicySet**

- **BackendSet** (list) - 见 **PolicyBackendSet** 模型定义
- **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。
- **PolicyId** (str) - 内容转发Id,默认内容转发类型下为空。
- **PolicyPriority** (int) - 内容转发优先级,范围[1,9999],数字越大优先级越高。默认内容转发规则下为0。
- **PolicyType** (str) - 内容类型,枚举值:Custom -> 客户自定义;Default -> 默认内容转发
- **TotalCount** (int) - 默认内容转发类型下返回当前rs总数
- **Type** (str) - 内容转发匹配字段的类型,枚举值:Domain -> 域名;Path -> 路径; 默认内容转发类型下为空
- **VServerId** (str) - 所属VServerId

**ULBBackendSet**

- **BackendId** (str) - 后端资源实例的Id
Expand All @@ -425,13 +408,22 @@ def describe_ulb(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
- **SubnetId** (str) - 后端提供服务的资源所在的子网的ID
- **Weight** (int) -

**ULBIPSet**
**ULBSSLSet**

- **Bandwidth** (int) - 弹性IP的带宽值(暂未对外开放)
- **BandwidthType** (int) - 弹性IP的带宽类型,枚举值:1 表示是共享带宽,0 普通带宽类型(暂未对外开放)
- **EIP** (str) - 弹性IP地址
- **EIPId** (str) - 弹性IP的ID
- **OperatorName** (str) - 弹性IP的运营商信息,枚举值为: Bgp:BGP IP International:国际IP
- **HashValue** (str) -
- **SSLId** (str) - SSL证书的Id
- **SSLName** (str) - SSL证书的名字

**ULBPolicySet**

- **BackendSet** (list) - 见 **PolicyBackendSet** 模型定义
- **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。
- **PolicyId** (str) - 内容转发Id,默认内容转发类型下为空。
- **PolicyPriority** (int) - 内容转发优先级,范围[1,9999],数字越大优先级越高。默认内容转发规则下为0。
- **PolicyType** (str) - 内容类型,枚举值:Custom -> 客户自定义;Default -> 默认内容转发
- **TotalCount** (int) - 默认内容转发类型下返回当前rs总数
- **Type** (str) - 内容转发匹配字段的类型,枚举值:Domain -> 域名;Path -> 路径; 默认内容转发类型下为空
- **VServerId** (str) - 所属VServerId

**ULBVServerSet**

Expand All @@ -452,6 +444,14 @@ def describe_ulb(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
- **VServerId** (str) - VServer实例的Id
- **VServerName** (str) - VServer实例的名字

**ULBIPSet**

- **Bandwidth** (int) - 弹性IP的带宽值(暂未对外开放)
- **BandwidthType** (int) - 弹性IP的带宽类型,枚举值:1 表示是共享带宽,0 普通带宽类型(暂未对外开放)
- **EIP** (str) - 弹性IP地址
- **EIPId** (str) - 弹性IP的ID
- **OperatorName** (str) - 弹性IP的运营商信息,枚举值为: Bgp:BGP IP International:国际IP

**ULBSet**

- **Bandwidth** (int) - 带宽
Expand Down
18 changes: 0 additions & 18 deletions ucloud/services/ulb/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,6 @@ class PolicyBackendSetSchema(schema.ResponseSchema):
}


class ULBPolicySetSchema(schema.ResponseSchema):
""" ULBPolicySet - 内容转发详细列表
"""

fields = {
"BackendSet": fields.List(PolicyBackendSetSchema()),
"Match": fields.Str(required=False, load_from="Match"),
"PolicyId": fields.Str(required=False, load_from="PolicyId"),
"PolicyPriority": fields.Int(
required=False, load_from="PolicyPriority"
),
"PolicyType": fields.Str(required=False, load_from="PolicyType"),
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
"Type": fields.Str(required=False, load_from="Type"),
"VServerId": fields.Str(required=False, load_from="VServerId"),
}


class ULBBackendSetSchema(schema.ResponseSchema):
""" ULBBackendSet - DescribeULB
"""
Expand Down