Skip to content

Commit fd00ff5

Browse files
authored
auto codegen for UEC
1 parent cfc2e35 commit fd00ff5

5 files changed

Lines changed: 49 additions & 66 deletions

File tree

docs/services.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,6 @@ UEC
108108
:members:
109109

110110

111-
UBill
112-
-----
113-
114-
.. autoclass:: ucloud.services.ubill.client.UBillClient
115-
:members:
116-
117-
118111
UFS
119112
---
120113

ucloud/client.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ def uaccount(self):
6262
self.logger,
6363
)
6464

65-
def ubill(self):
66-
from ucloud.services.ubill.client import UBillClient
67-
68-
return UBillClient(
69-
self._auto_config("ubill"),
70-
self.transport,
71-
self.middleware,
72-
self.logger,
73-
)
74-
7565
def ucdn(self):
7666
from ucloud.services.ucdn.client import UCDNClient
7767

ucloud/services/uec/client.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ def create_u_ec_holder(
109109
110110
**Request Model**
111111
112+
**CreateUEcHolderParamStorage**
113+
- **Path** (str) - 存储卷挂载路径
114+
- **ResourceId** (str) - 存储卷资源id
115+
116+
112117
**CreateUEcHolderParamPack**
113118
- **Args** (str) - 容器参数(多个用;隔开)
114119
- **Cmd** (str) - 开启容器的命令
@@ -126,11 +131,6 @@ def create_u_ec_holder(
126131
- **StoreAddress** (str) - 镜像仓库地址
127132
128133
129-
**CreateUEcHolderParamStorage**
130-
- **Path** (str) - 存储卷挂载路径
131-
- **ResourceId** (str) - 存储卷资源id
132-
133-
134134
"""
135135
# build request
136136
d = {
@@ -441,6 +441,17 @@ def describe_u_ec_holder(
441441
- **Value** (str) - 环境变量Value值
442442
443443
444+
**ImageList**
445+
- **ImageKey** (str) - 镜像密钥
446+
- **StoreAddr** (str) - 仓库地址
447+
- **UserName** (str) - 用户名称
448+
449+
450+
**IpList**
451+
- **Ip** (str) - 外网ip
452+
- **Isp** (str) - 运营商
453+
454+
444455
**StorVolumeInfo**
445456
- **DiskSize** (int) - 容量(单位GB)
446457
- **MountPoint** (str) - 挂载点
@@ -461,17 +472,6 @@ def describe_u_ec_holder(
461472
- **WorkDir** (str) - 工作目录
462473
463474
464-
**ImageList**
465-
- **ImageKey** (str) - 镜像密钥
466-
- **StoreAddr** (str) - 仓库地址
467-
- **UserName** (str) - 用户名称
468-
469-
470-
**IpList**
471-
- **Ip** (str) - 外网ip
472-
- **Isp** (str) - 运营商
473-
474-
475475
**HolderList**
476476
- **City** (str) - 城市名称
477477
- **CreateTime** (int) - 创建时间

ucloud/services/uec/schemas/apis.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ class CreateUEcFirewallResponseSchema(schema.ResponseSchema):
7777
"""
7878

7979

80+
class CreateUEcHolderParamStorageSchema(schema.RequestSchema):
81+
"""CreateUEcHolderParamStorage -"""
82+
83+
fields = {
84+
"Path": fields.Str(required=False, dump_to="Path"),
85+
"ResourceId": fields.Str(required=False, dump_to="ResourceId"),
86+
}
87+
88+
8089
class CreateUEcHolderParamPackSchema(schema.RequestSchema):
8190
"""CreateUEcHolderParamPack -"""
8291

@@ -102,15 +111,6 @@ class CreateUEcHolderParamImageSchema(schema.RequestSchema):
102111
}
103112

104113

105-
class CreateUEcHolderParamStorageSchema(schema.RequestSchema):
106-
"""CreateUEcHolderParamStorage -"""
107-
108-
fields = {
109-
"Path": fields.Str(required=False, dump_to="Path"),
110-
"ResourceId": fields.Str(required=False, dump_to="ResourceId"),
111-
}
112-
113-
114114
class CreateUEcHolderRequestSchema(schema.RequestSchema):
115115
"""CreateUEcHolder - 创建容器组"""
116116

ucloud/services/uec/schemas/models.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ class ResourceInfoSchema(schema.ResponseSchema):
5050
}
5151

5252

53-
class EnvListSchema(schema.ResponseSchema):
54-
"""EnvList - 容器环境变量列表"""
55-
56-
fields = {
57-
"Key": fields.Str(required=False, load_from="Key"),
58-
"Value": fields.Str(required=False, load_from="Value"),
59-
}
60-
61-
6253
class CfgDictListSchema(schema.ResponseSchema):
6354
"""CfgDictList - 容器配置字典列表"""
6455

@@ -69,23 +60,22 @@ class CfgDictListSchema(schema.ResponseSchema):
6960
}
7061

7162

72-
class IpListSchema(schema.ResponseSchema):
73-
"""IpList - 容器组外网ip列表"""
63+
class EnvListSchema(schema.ResponseSchema):
64+
"""EnvList - 容器环境变量列表"""
7465

7566
fields = {
76-
"Ip": fields.Str(required=False, load_from="Ip"),
77-
"Isp": fields.Str(required=False, load_from="Isp"),
67+
"Key": fields.Str(required=False, load_from="Key"),
68+
"Value": fields.Str(required=False, load_from="Value"),
7869
}
7970

8071

81-
class StorVolumeInfoSchema(schema.ResponseSchema):
82-
"""StorVolumeInfo - 容器组存储卷信息"""
72+
class ImageListSchema(schema.ResponseSchema):
73+
"""ImageList - 容器组镜像密钥列表"""
8374

8475
fields = {
85-
"DiskSize": fields.Int(required=False, load_from="DiskSize"),
86-
"MountPoint": fields.Str(required=False, load_from="MountPoint"),
87-
"Name": fields.Str(required=False, load_from="Name"),
88-
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
76+
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
77+
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
78+
"UserName": fields.Str(required=False, load_from="UserName"),
8979
}
9080

9181

@@ -106,13 +96,23 @@ class DockerInfoSchema(schema.ResponseSchema):
10696
}
10797

10898

109-
class ImageListSchema(schema.ResponseSchema):
110-
"""ImageList - 容器组镜像密钥列表"""
99+
class StorVolumeInfoSchema(schema.ResponseSchema):
100+
"""StorVolumeInfo - 容器组存储卷信息"""
111101

112102
fields = {
113-
"ImageKey": fields.Str(required=False, load_from="ImageKey"),
114-
"StoreAddr": fields.Str(required=False, load_from="StoreAddr"),
115-
"UserName": fields.Str(required=False, load_from="UserName"),
103+
"DiskSize": fields.Int(required=False, load_from="DiskSize"),
104+
"MountPoint": fields.Str(required=False, load_from="MountPoint"),
105+
"Name": fields.Str(required=False, load_from="Name"),
106+
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
107+
}
108+
109+
110+
class IpListSchema(schema.ResponseSchema):
111+
"""IpList - 容器组外网ip列表"""
112+
113+
fields = {
114+
"Ip": fields.Str(required=False, load_from="Ip"),
115+
"Isp": fields.Str(required=False, load_from="Isp"),
116116
}
117117

118118

0 commit comments

Comments
 (0)