Skip to content
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
13 changes: 6 additions & 7 deletions docs/services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,6 @@ UPFS
:members:


UPgSQL
------

.. autoclass:: ucloud.services.upgsql.client.UPgSQLClient
:members:


UPhone
------

Expand Down Expand Up @@ -408,3 +401,9 @@ sandbox
.. autoclass:: ucloud.services.sandbox.client.SandboxClient
:members:


UPgSQL
------

.. autoclass:: ucloud.services.upgsql.client.UPgSQLClient
:members:
20 changes: 10 additions & 10 deletions ucloud/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,16 +502,6 @@ def uphost(self):
self.logger,
)

def upgsql(self):
from ucloud.services.upgsql.client import UPgSQLClient

return UPgSQLClient(
self._auto_config("upgsql"),
self.transport,
self.middleware,
self.logger,
)

def uphone(self):
from ucloud.services.uphone.client import UPhoneClient

Expand Down Expand Up @@ -607,3 +597,13 @@ def _auto_config(self, package="generic"):
package, self._config.get("user_agent") or ""
)
return dict(user_agent=user_agent.rstrip(), **self._config)

def upgsql(self):
from ucloud.services.upgsql.client import UPgSQLClient

return UPgSQLClient(
self._auto_config("upgsql"),
self.transport,
self.middleware,
self.logger,
)
15 changes: 15 additions & 0 deletions ucloud/services/udbpostgresql/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,28 @@ def create_u_pg_sql_instance(
- **SubnetID** (str) - (Required) 子网ID
- **VPCID** (str) - (Required) VPC的ID
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **BackupZone** (str) - 高可用实例的备库可用区
- **InstanceMode** (str) - UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例 "HA": 高可用版UDB实例 默认是"Normal"
- **Labels** (list) - 见 **CreateUPgSQLInstanceParamLabels** 模型定义
- **SecGroupId** (list) - 见 **CreateUPgSQLInstanceParamSecGroupId** 模型定义

**Response**

- **InstanceID** (str) - 资源ID
- **Message** (str) - 返回信息

**Request Model**

**CreateUPgSQLInstanceParamLabels**
- **Key** (str) - 用户资源标签的键值
- **Value** (str) - 用户资源标签的键名


**CreateUPgSQLInstanceParamSecGroupId**
- **Id** (str) - 安全组id
- **Priority** (int) - 安全组优先级


"""
# build request
d = {
Expand Down
21 changes: 21 additions & 0 deletions ucloud/services/udbpostgresql/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,41 @@ class BackupUPgSQLLogResponseSchema(schema.ResponseSchema):
"""


class CreateUPgSQLInstanceParamLabelsSchema(schema.RequestSchema):
"""CreateUPgSQLInstanceParamLabels -"""

fields = {
"Key": fields.Str(required=False, dump_to="Key"),
"Value": fields.Str(required=False, dump_to="Value"),
}


class CreateUPgSQLInstanceParamSecGroupIdSchema(schema.RequestSchema):
"""CreateUPgSQLInstanceParamSecGroupId -"""

fields = {
"Id": fields.Str(required=False, dump_to="Id"),
"Priority": fields.Int(required=False, dump_to="Priority"),
}


class CreateUPgSQLInstanceRequestSchema(schema.RequestSchema):
"""CreateUPgSQLInstance - 创建PG云数据库"""

fields = {
"AdminPassword": fields.Str(required=True, dump_to="AdminPassword"),
"BackupZone": fields.Str(required=False, dump_to="BackupZone"),
"DBVersion": fields.Str(required=True, dump_to="DBVersion"),
"DiskSpace": fields.Str(required=True, dump_to="DiskSpace"),
"InstanceMode": fields.Str(required=False, dump_to="InstanceMode"),
"Labels": fields.List(CreateUPgSQLInstanceParamLabelsSchema()),
"MachineType": fields.Str(required=True, dump_to="MachineType"),
"Name": fields.Str(required=True, dump_to="Name"),
"ParamGroupID": fields.Int(required=True, dump_to="ParamGroupID"),
"Port": fields.Int(required=True, dump_to="Port"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Region": fields.Str(required=True, dump_to="Region"),
"SecGroupId": fields.List(CreateUPgSQLInstanceParamSecGroupIdSchema()),
"SubnetID": fields.Str(required=True, dump_to="SubnetID"),
"VPCID": fields.Str(required=True, dump_to="VPCID"),
"Zone": fields.Str(required=True, dump_to="Zone"),
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.154"
version = "0.11.155"
Loading