Skip to content

Commit 3736093

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.51 (#255)
1 parent ba489f9 commit 3736093

File tree

6 files changed

+109
-94
lines changed

6 files changed

+109
-94
lines changed

‎docs/services.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,13 @@ UFile
199199
:members:
200200

201201

202+
UGN
203+
---
204+
205+
.. autoclass:: ucloud.services.ugn.client.UGNClient
206+
:members:
207+
208+
202209
UHub
203210
----
204211

‎ucloud/client.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,16 @@ def ufile(self):
242242
self.logger,
243243
)
244244

245+
def ugn(self):
246+
from ucloud.services.ugn.client import UGNClient
247+
248+
return UGNClient(
249+
self._auto_config("ugn"),
250+
self.transport,
251+
self.middleware,
252+
self.logger,
253+
)
254+
245255
def uhost(self):
246256
from ucloud.services.uhost.client import UHostClient
247257

‎ucloud/services/ugn/client.py

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ def create_ugn(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
110110
**Request**
111111
112112
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
113-
- **Name** (str) - 云联网名称，如果没有传入，默认值为“UGN”
114-
- **Remark** (str) - 云联网备注，如果没有传入的话，默认为“”
115-
- **Tag** (str) - 业务组Id，如果没有传入，默认值为“Default”
113+
- **Name** (str) -
114+
- **Networks** (list) - 数组，数组内每个元素的字段如下：NetworkID：string，网络实例 ID，如 uvnet-xxxx；Type：string，网络实例类型，枚举值：VPC/HybridGW/...；Region：string，网络实例所属地域，如 cn-sh2；OrgName：string，网络实例所属项目名，如 org-xxx
115+
- **Remark** (str) -
116116
117117
**Response**
118118
119-
- **Message** (str) - 返回码描述信息
120-
- **UGNId** (str) - 云联网Id
119+
- **Message** (str) -
120+
- **UGNID** (str) -
121121
122122
"""
123123
# build request
@@ -227,46 +227,6 @@ def describe_inter_region_bandwidth(
227227
resp = self.invoke("DescribeInterRegionBandwidth", d, **kwargs)
228228
return apis.DescribeInterRegionBandwidthResponseSchema().loads(resp)
229229

230-
def describe_ugn(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
231-
"""DescribeUGN - 查询云联网
232-
233-
**Request**
234-
235-
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
236-
- **Limit** (int) - 数据分页值。默认为20
237-
- **Offset** (int) - 数据偏移量。默认为0
238-
- **UGNIds** (list) - 云联网Id
239-
240-
**Response**
241-
242-
- **Message** (str) - 返回码描述信息
243-
- **TotalCount** (int) - UGNs字段的数量
244-
- **UGNs** (list) - 见 **UGN** 模型定义
245-
246-
**Response Model**
247-
248-
**UGN**
249-
- **CreateTime** (int) - 云联网创建时间
250-
- **Instances** (list) - 实例Id
251-
- **InterRegionBandwidths** (list) - 跨域路由Id
252-
- **Name** (str) - 云联网名称
253-
- **Remark** (str) - 云联网备注
254-
- **RouteRules** (list) - 路由规则Id
255-
- **Tag** (str) - 业务组Id
256-
- **UGNId** (str) - 云联网Id
257-
258-
259-
"""
260-
# build request
261-
d = {
262-
"ProjectId": self.config.project_id,
263-
}
264-
req and d.update(req)
265-
d = apis.DescribeUGNRequestSchema().dumps(d)
266-
267-
resp = self.invoke("DescribeUGN", d, **kwargs)
268-
return apis.DescribeUGNResponseSchema().loads(resp)
269-
270230
def describe_ugn_instance(
271231
self, req: typing.Optional[dict] = None, **kwargs
272232
) -> dict:
@@ -526,3 +486,45 @@ def unpublish_ugn_route_rule(
526486

527487
resp = self.invoke("UnpublishUGNRouteRule", d, **kwargs)
528488
return apis.UnpublishUGNRouteRuleResponseSchema().loads(resp)
489+
490+
def update_ugn_bw_package(
491+
self, req: typing.Optional[dict] = None, **kwargs
492+
) -> dict:
493+
"""UpdateUGNBwPackage - 更新带宽包配置
494+
495+
**Request**
496+
497+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
498+
- **BwBidRate** (float) - (Required)
499+
- **BwULRate** (float) - (Required)
500+
- **PackageID** (str) - (Required) 带宽包 ID
501+
- **Path** (str) - (Required)
502+
- **PayMode** (str) - (Required)
503+
- **Qos** (str) - (Required)
504+
- **RegionA** (str) - (Required)
505+
- **RegionABwMax** (int) - (Required)
506+
- **RegionABwMin** (int) - (Required)
507+
- **RegionB** (str) - (Required)
508+
- **RegionBBwMax** (int) - (Required)
509+
- **RegionBBwMin** (int) - (Required)
510+
- **UGNID** (str) - (Required) 所绑定的 UGN ID
511+
- **ChargeType** (str) -
512+
- **Coupon** (str) -
513+
- **Name** (str) - 名称
514+
- **Quantity** (str) -
515+
- **Remark** (str) - 备注
516+
517+
**Response**
518+
519+
- **Message** (str) -
520+
521+
"""
522+
# build request
523+
d = {
524+
"ProjectId": self.config.project_id,
525+
}
526+
req and d.update(req)
527+
d = apis.UpdateUGNBwPackageRequestSchema().dumps(d)
528+
529+
resp = self.invoke("UpdateUGNBwPackage", d, **kwargs)
530+
return apis.UpdateUGNBwPackageResponseSchema().loads(resp)

‎ucloud/services/ugn/schemas/apis.py

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,18 @@ class CreateUGNRequestSchema(schema.RequestSchema):
111111

112112
fields = {
113113
"Name": fields.Str(required=False, dump_to="Name"),
114+
"Networks": fields.List(fields.Str()),
114115
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
115116
"Remark": fields.Str(required=False, dump_to="Remark"),
116-
"Tag": fields.Str(required=False, dump_to="Tag"),
117117
}
118118

119119

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

123123
fields = {
124-
"Message": fields.Str(required=True, load_from="Message"),
125-
"UGNId": fields.Str(required=True, load_from="UGNId"),
124+
"Message": fields.Str(required=False, load_from="Message"),
125+
"UGNID": fields.Str(required=False, load_from="UGNID"),
126126
}
127127

128128

@@ -210,36 +210,6 @@ class DescribeInterRegionBandwidthResponseSchema(schema.ResponseSchema):
210210
}
211211

212212

213-
"""
214-
API: DescribeUGN
215-
216-
查询云联网
217-
"""
218-
219-
220-
class DescribeUGNRequestSchema(schema.RequestSchema):
221-
"""DescribeUGN - 查询云联网"""
222-
223-
fields = {
224-
"Limit": fields.Int(required=False, dump_to="Limit"),
225-
"Offset": fields.Int(required=False, dump_to="Offset"),
226-
"ProjectId": fields.Str(required=True, dump_to="ProjectId"),
227-
"UGNIds": fields.List(fields.Str()),
228-
}
229-
230-
231-
class DescribeUGNResponseSchema(schema.ResponseSchema):
232-
"""DescribeUGN - 查询云联网"""
233-
234-
fields = {
235-
"Message": fields.Str(required=True, load_from="Message"),
236-
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
237-
"UGNs": fields.List(
238-
models.UGNSchema(), required=False, load_from="UGNs"
239-
),
240-
}
241-
242-
243213
"""
244214
API: DescribeUGNInstance
245215
@@ -470,3 +440,44 @@ class UnpublishUGNRouteRuleResponseSchema(schema.ResponseSchema):
470440
fields = {
471441
"Message": fields.Str(required=True, load_from="Message"),
472442
}
443+
444+
445+
"""
446+
API: UpdateUGNBwPackage
447+
448+
更新带宽包配置
449+
"""
450+
451+
452+
class UpdateUGNBwPackageRequestSchema(schema.RequestSchema):
453+
"""UpdateUGNBwPackage - 更新带宽包配置"""
454+
455+
fields = {
456+
"BwBidRate": fields.Float(required=True, dump_to="BwBidRate"),
457+
"BwULRate": fields.Float(required=True, dump_to="BwULRate"),
458+
"ChargeType": fields.Str(required=False, dump_to="ChargeType"),
459+
"Coupon": fields.Str(required=False, dump_to="Coupon"),
460+
"Name": fields.Str(required=False, dump_to="Name"),
461+
"PackageID": fields.Str(required=True, dump_to="PackageID"),
462+
"Path": fields.Str(required=True, dump_to="Path"),
463+
"PayMode": fields.Str(required=True, dump_to="PayMode"),
464+
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
465+
"Qos": fields.Str(required=True, dump_to="Qos"),
466+
"Quantity": fields.Str(required=False, dump_to="Quantity"),
467+
"RegionA": fields.Str(required=True, dump_to="RegionA"),
468+
"RegionABwMax": fields.Int(required=True, dump_to="RegionABwMax"),
469+
"RegionABwMin": fields.Int(required=True, dump_to="RegionABwMin"),
470+
"RegionB": fields.Str(required=True, dump_to="RegionB"),
471+
"RegionBBwMax": fields.Int(required=True, dump_to="RegionBBwMax"),
472+
"RegionBBwMin": fields.Int(required=True, dump_to="RegionBBwMin"),
473+
"Remark": fields.Str(required=False, dump_to="Remark"),
474+
"UGNID": fields.Str(required=True, dump_to="UGNID"),
475+
}
476+
477+
478+
class UpdateUGNBwPackageResponseSchema(schema.ResponseSchema):
479+
"""UpdateUGNBwPackage - 更新带宽包配置"""
480+
481+
fields = {
482+
"Message": fields.Str(required=True, load_from="Message"),
483+
}

‎ucloud/services/ugn/schemas/models.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ class InterRegionBandwidthSchema(schema.ResponseSchema):
2222
}
2323

2424

25-
class UGNSchema(schema.ResponseSchema):
26-
"""UGN - 云联网信息"""
27-
28-
fields = {
29-
"CreateTime": fields.Int(required=True, load_from="CreateTime"),
30-
"Instances": fields.List(fields.Str()),
31-
"InterRegionBandwidths": fields.List(fields.Str()),
32-
"Name": fields.Str(required=True, load_from="Name"),
33-
"Remark": fields.Str(required=True, load_from="Remark"),
34-
"RouteRules": fields.List(fields.Str()),
35-
"Tag": fields.Str(required=True, load_from="Tag"),
36-
"UGNId": fields.Str(required=True, load_from="UGNId"),
37-
}
38-
39-
4025
class InstanceSchema(schema.ResponseSchema):
4126
"""Instance - 云联网实例信息"""
4227

‎ucloud/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.11.50"
1+
version = "0.11.51"

0 commit comments

Comments
 (0)