Skip to content

sdk: rolling update for 0.11.51 #255

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

Merged
merged 1 commit into from
Nov 27, 2023
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
7 changes: 7 additions & 0 deletions docs/services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,13 @@ UFile
:members:


UGN
---

.. autoclass:: ucloud.services.ugn.client.UGNClient
:members:


UHub
----

Expand Down
10 changes: 10 additions & 0 deletions ucloud/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,16 @@ def ufile(self):
self.logger,
)

def ugn(self):
from ucloud.services.ugn.client import UGNClient

return UGNClient(
self._auto_config("ugn"),
self.transport,
self.middleware,
self.logger,
)

def uhost(self):
from ucloud.services.uhost.client import UHostClient

Expand Down
92 changes: 47 additions & 45 deletions ucloud/services/ugn/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ def create_ugn(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Name** (str) - 云联网名称,如果没有传入,默认值为“UGN”
- **Remark** (str) - 云联网备注,如果没有传入的话,默认为“”
- **Tag** (str) - 业务组Id,如果没有传入,默认值为“Default”
- **Name** (str) -
- **Networks** (list) - 数组,数组内每个元素的字段如下:NetworkID:string,网络实例 ID,如 uvnet-xxxx;Type:string,网络实例类型,枚举值:VPC/HybridGW/...;Region:string,网络实例所属地域,如 cn-sh2;OrgName:string,网络实例所属项目名,如 org-xxx
- **Remark** (str) -

**Response**

- **Message** (str) - 返回码描述信息
- **UGNId** (str) - 云联网Id
- **Message** (str) -
- **UGNID** (str) -

"""
# build request
Expand Down Expand Up @@ -227,46 +227,6 @@ def describe_inter_region_bandwidth(
resp = self.invoke("DescribeInterRegionBandwidth", d, **kwargs)
return apis.DescribeInterRegionBandwidthResponseSchema().loads(resp)

def describe_ugn(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
"""DescribeUGN - 查询云联网

**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Limit** (int) - 数据分页值。默认为20
- **Offset** (int) - 数据偏移量。默认为0
- **UGNIds** (list) - 云联网Id

**Response**

- **Message** (str) - 返回码描述信息
- **TotalCount** (int) - UGNs字段的数量
- **UGNs** (list) - 见 **UGN** 模型定义

**Response Model**

**UGN**
- **CreateTime** (int) - 云联网创建时间
- **Instances** (list) - 实例Id
- **InterRegionBandwidths** (list) - 跨域路由Id
- **Name** (str) - 云联网名称
- **Remark** (str) - 云联网备注
- **RouteRules** (list) - 路由规则Id
- **Tag** (str) - 业务组Id
- **UGNId** (str) - 云联网Id


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

resp = self.invoke("DescribeUGN", d, **kwargs)
return apis.DescribeUGNResponseSchema().loads(resp)

def describe_ugn_instance(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
Expand Down Expand Up @@ -526,3 +486,45 @@ def unpublish_ugn_route_rule(

resp = self.invoke("UnpublishUGNRouteRule", d, **kwargs)
return apis.UnpublishUGNRouteRuleResponseSchema().loads(resp)

def update_ugn_bw_package(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
"""UpdateUGNBwPackage - 更新带宽包配置

**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **BwBidRate** (float) - (Required)
- **BwULRate** (float) - (Required)
- **PackageID** (str) - (Required) 带宽包 ID
- **Path** (str) - (Required)
- **PayMode** (str) - (Required)
- **Qos** (str) - (Required)
- **RegionA** (str) - (Required)
- **RegionABwMax** (int) - (Required)
- **RegionABwMin** (int) - (Required)
- **RegionB** (str) - (Required)
- **RegionBBwMax** (int) - (Required)
- **RegionBBwMin** (int) - (Required)
- **UGNID** (str) - (Required) 所绑定的 UGN ID
- **ChargeType** (str) -
- **Coupon** (str) -
- **Name** (str) - 名称
- **Quantity** (str) -
- **Remark** (str) - 备注

**Response**

- **Message** (str) -

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

resp = self.invoke("UpdateUGNBwPackage", d, **kwargs)
return apis.UpdateUGNBwPackageResponseSchema().loads(resp)
77 changes: 44 additions & 33 deletions ucloud/services/ugn/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ class CreateUGNRequestSchema(schema.RequestSchema):

fields = {
"Name": fields.Str(required=False, dump_to="Name"),
"Networks": fields.List(fields.Str()),
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
"Remark": fields.Str(required=False, dump_to="Remark"),
"Tag": fields.Str(required=False, dump_to="Tag"),
}


class CreateUGNResponseSchema(schema.ResponseSchema):
"""CreateUGN - 创建云联网"""

fields = {
"Message": fields.Str(required=True, load_from="Message"),
"UGNId": fields.Str(required=True, load_from="UGNId"),
"Message": fields.Str(required=False, load_from="Message"),
"UGNID": fields.Str(required=False, load_from="UGNID"),
}


Expand Down Expand Up @@ -210,36 +210,6 @@ class DescribeInterRegionBandwidthResponseSchema(schema.ResponseSchema):
}


"""
API: DescribeUGN

查询云联网
"""


class DescribeUGNRequestSchema(schema.RequestSchema):
"""DescribeUGN - 查询云联网"""

fields = {
"Limit": fields.Int(required=False, dump_to="Limit"),
"Offset": fields.Int(required=False, dump_to="Offset"),
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
"UGNIds": fields.List(fields.Str()),
}


class DescribeUGNResponseSchema(schema.ResponseSchema):
"""DescribeUGN - 查询云联网"""

fields = {
"Message": fields.Str(required=True, load_from="Message"),
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
"UGNs": fields.List(
models.UGNSchema(), required=False, load_from="UGNs"
),
}


"""
API: DescribeUGNInstance

Expand Down Expand Up @@ -470,3 +440,44 @@ class UnpublishUGNRouteRuleResponseSchema(schema.ResponseSchema):
fields = {
"Message": fields.Str(required=True, load_from="Message"),
}


"""
API: UpdateUGNBwPackage

更新带宽包配置
"""


class UpdateUGNBwPackageRequestSchema(schema.RequestSchema):
"""UpdateUGNBwPackage - 更新带宽包配置"""

fields = {
"BwBidRate": fields.Float(required=True, dump_to="BwBidRate"),
"BwULRate": fields.Float(required=True, dump_to="BwULRate"),
"ChargeType": fields.Str(required=False, dump_to="ChargeType"),
"Coupon": fields.Str(required=False, dump_to="Coupon"),
"Name": fields.Str(required=False, dump_to="Name"),
"PackageID": fields.Str(required=True, dump_to="PackageID"),
"Path": fields.Str(required=True, dump_to="Path"),
"PayMode": fields.Str(required=True, dump_to="PayMode"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Qos": fields.Str(required=True, dump_to="Qos"),
"Quantity": fields.Str(required=False, dump_to="Quantity"),
"RegionA": fields.Str(required=True, dump_to="RegionA"),
"RegionABwMax": fields.Int(required=True, dump_to="RegionABwMax"),
"RegionABwMin": fields.Int(required=True, dump_to="RegionABwMin"),
"RegionB": fields.Str(required=True, dump_to="RegionB"),
"RegionBBwMax": fields.Int(required=True, dump_to="RegionBBwMax"),
"RegionBBwMin": fields.Int(required=True, dump_to="RegionBBwMin"),
"Remark": fields.Str(required=False, dump_to="Remark"),
"UGNID": fields.Str(required=True, dump_to="UGNID"),
}


class UpdateUGNBwPackageResponseSchema(schema.ResponseSchema):
"""UpdateUGNBwPackage - 更新带宽包配置"""

fields = {
"Message": fields.Str(required=True, load_from="Message"),
}
15 changes: 0 additions & 15 deletions ucloud/services/ugn/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,6 @@ class InterRegionBandwidthSchema(schema.ResponseSchema):
}


class UGNSchema(schema.ResponseSchema):
"""UGN - 云联网信息"""

fields = {
"CreateTime": fields.Int(required=True, load_from="CreateTime"),
"Instances": fields.List(fields.Str()),
"InterRegionBandwidths": fields.List(fields.Str()),
"Name": fields.Str(required=True, load_from="Name"),
"Remark": fields.Str(required=True, load_from="Remark"),
"RouteRules": fields.List(fields.Str()),
"Tag": fields.Str(required=True, load_from="Tag"),
"UGNId": fields.Str(required=True, load_from="UGNId"),
}


class InstanceSchema(schema.ResponseSchema):
"""Instance - 云联网实例信息"""

Expand Down
2 changes: 1 addition & 1 deletion ucloud/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.11.50"
version = "0.11.51"