From a517ac495159f4e05ca0b7ce9eee3ae89f363b72 Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Mon, 27 Nov 2023 09:19:22 +0000 Subject: [PATCH] sdk: rolling update for 0.11.51 --- docs/services.rst | 7 ++ ucloud/client.py | 10 +++ ucloud/services/ugn/client.py | 92 ++++++++++++++------------- ucloud/services/ugn/schemas/apis.py | 77 ++++++++++++---------- ucloud/services/ugn/schemas/models.py | 15 ----- ucloud/version.py | 2 +- 6 files changed, 109 insertions(+), 94 deletions(-) diff --git a/docs/services.rst b/docs/services.rst index 9165ca99..95c6a69c 100644 --- a/docs/services.rst +++ b/docs/services.rst @@ -199,6 +199,13 @@ UFile :members: +UGN +--- + +.. autoclass:: ucloud.services.ugn.client.UGNClient + :members: + + UHub ---- diff --git a/ucloud/client.py b/ucloud/client.py index e21ce7cb..1deaf422 100644 --- a/ucloud/client.py +++ b/ucloud/client.py @@ -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 diff --git a/ucloud/services/ugn/client.py b/ucloud/services/ugn/client.py index 9138f042..8d932c04 100644 --- a/ucloud/services/ugn/client.py +++ b/ucloud/services/ugn/client.py @@ -110,14 +110,14 @@ def create_ugn(self, req: typing.Optional[dict] = None, **kwargs) -> dict: **Request** - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ - - **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 @@ -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接口 `_ - - **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: @@ -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接口 `_ + - **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) diff --git a/ucloud/services/ugn/schemas/apis.py b/ucloud/services/ugn/schemas/apis.py index 1359ba18..35d67f1e 100644 --- a/ucloud/services/ugn/schemas/apis.py +++ b/ucloud/services/ugn/schemas/apis.py @@ -111,9 +111,9 @@ 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"), } @@ -121,8 +121,8 @@ 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"), } @@ -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 @@ -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"), + } diff --git a/ucloud/services/ugn/schemas/models.py b/ucloud/services/ugn/schemas/models.py index f6209eb9..a7165334 100644 --- a/ucloud/services/ugn/schemas/models.py +++ b/ucloud/services/ugn/schemas/models.py @@ -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 - 云联网实例信息""" diff --git a/ucloud/version.py b/ucloud/version.py index e823a9dd..3b98991e 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.50" +version = "0.11.51"