Skip to content

Commit d74e2cc

Browse files
authored
sdk: rolling update for 0.11.36 (#235)
1 parent 8ccd011 commit d74e2cc

File tree

17 files changed

+728
-181
lines changed

17 files changed

+728
-181
lines changed

ucloud/services/ipsecvpn/schemas/models.py

+24-24
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,30 @@ class VPNGatewayDataSetSchema(schema.ResponseSchema):
4949
}
5050

5151

52+
class IKEDataSchema(schema.ResponseSchema):
53+
"""IKEData - IKE信息"""
54+
55+
fields = {
56+
"IKEAuthenticationAlgorithm": fields.Str(
57+
required=False, load_from="IKEAuthenticationAlgorithm"
58+
),
59+
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
60+
"IKEEncryptionAlgorithm": fields.Str(
61+
required=False, load_from="IKEEncryptionAlgorithm"
62+
),
63+
"IKEExchangeMode": fields.Str(
64+
required=False, load_from="IKEExchangeMode"
65+
),
66+
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
67+
"IKEPreSharedKey": fields.Str(
68+
required=False, load_from="IKEPreSharedKey"
69+
),
70+
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
71+
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
72+
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
73+
}
74+
75+
5276
class IPSecDataSchema(schema.ResponseSchema):
5377
"""IPSecData - IPSec参数"""
5478

@@ -74,30 +98,6 @@ class IPSecDataSchema(schema.ResponseSchema):
7498
}
7599

76100

77-
class IKEDataSchema(schema.ResponseSchema):
78-
"""IKEData - IKE信息"""
79-
80-
fields = {
81-
"IKEAuthenticationAlgorithm": fields.Str(
82-
required=False, load_from="IKEAuthenticationAlgorithm"
83-
),
84-
"IKEDhGroup": fields.Str(required=False, load_from="IKEDhGroup"),
85-
"IKEEncryptionAlgorithm": fields.Str(
86-
required=False, load_from="IKEEncryptionAlgorithm"
87-
),
88-
"IKEExchangeMode": fields.Str(
89-
required=False, load_from="IKEExchangeMode"
90-
),
91-
"IKELocalId": fields.Str(required=False, load_from="IKELocalId"),
92-
"IKEPreSharedKey": fields.Str(
93-
required=False, load_from="IKEPreSharedKey"
94-
),
95-
"IKERemoteId": fields.Str(required=False, load_from="IKERemoteId"),
96-
"IKESALifetime": fields.Str(required=False, load_from="IKESALifetime"),
97-
"IKEVersion": fields.Str(required=False, load_from="IKEVersion"),
98-
}
99-
100-
101101
class VPNTunnelDataSetSchema(schema.ResponseSchema):
102102
"""VPNTunnelDataSet - DescribeVPNTunnel信息"""
103103

ucloud/services/pathx/schemas/models.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ class OutPublicIpInfoSchema(schema.ResponseSchema):
125125
}
126126

127127

128+
class ForwardTaskSchema(schema.ResponseSchema):
129+
"""ForwardTask - 全球统一接入转发端口任务信息"""
130+
131+
fields = {
132+
"Port": fields.Int(required=True, load_from="Port"),
133+
"Protocol": fields.Str(required=True, load_from="Protocol"),
134+
"RSPort": fields.Int(required=True, load_from="RSPort"),
135+
}
136+
137+
128138
class AccelerationAreaInfosSchema(schema.ResponseSchema):
129139
"""AccelerationAreaInfos - 加速大区信息"""
130140

@@ -136,16 +146,6 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
136146
}
137147

138148

139-
class ForwardTaskSchema(schema.ResponseSchema):
140-
"""ForwardTask - 全球统一接入转发端口任务信息"""
141-
142-
fields = {
143-
"Port": fields.Int(required=True, load_from="Port"),
144-
"Protocol": fields.Str(required=True, load_from="Protocol"),
145-
"RSPort": fields.Int(required=True, load_from="RSPort"),
146-
}
147-
148-
149149
class ForwardInfoSchema(schema.ResponseSchema):
150150
"""ForwardInfo - 全球统一接入加速实例配置信息"""
151151

@@ -227,34 +227,34 @@ class UPathSetSchema(schema.ResponseSchema):
227227
}
228228

229229

230-
class UGAL7ForwarderSchema(schema.ResponseSchema):
231-
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
230+
class UGAATaskSchema(schema.ResponseSchema):
231+
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
232232

233233
fields = {
234234
"Port": fields.Int(required=True, load_from="Port"),
235235
"Protocol": fields.Str(required=True, load_from="Protocol"),
236-
"RSPort": fields.Int(required=True, load_from="RSPort"),
237-
"SSLId": fields.Str(required=False, load_from="SSLId"),
238-
"SSLName": fields.Str(required=False, load_from="SSLName"),
239236
}
240237

241238

242-
class UGAL4ForwarderSchema(schema.ResponseSchema):
243-
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
239+
class UGAL7ForwarderSchema(schema.ResponseSchema):
240+
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
244241

245242
fields = {
246243
"Port": fields.Int(required=True, load_from="Port"),
247244
"Protocol": fields.Str(required=True, load_from="Protocol"),
248245
"RSPort": fields.Int(required=True, load_from="RSPort"),
246+
"SSLId": fields.Str(required=False, load_from="SSLId"),
247+
"SSLName": fields.Str(required=False, load_from="SSLName"),
249248
}
250249

251250

252-
class UGAATaskSchema(schema.ResponseSchema):
253-
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
251+
class UGAL4ForwarderSchema(schema.ResponseSchema):
252+
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
254253

255254
fields = {
256255
"Port": fields.Int(required=True, load_from="Port"),
257256
"Protocol": fields.Str(required=True, load_from="Protocol"),
257+
"RSPort": fields.Int(required=True, load_from="RSPort"),
258258
}
259259

260260

ucloud/services/ubill/schemas/models.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ class AccountInfoSchema(schema.ResponseSchema):
1717
}
1818

1919

20-
class ResourceExtendInfoSchema(schema.ResponseSchema):
21-
"""ResourceExtendInfo - 资源标识"""
20+
class ItemDetailSchema(schema.ResponseSchema):
21+
"""ItemDetail - 产品配置"""
2222

2323
fields = {
24-
"KeyId": fields.Str(required=True, load_from="KeyId"),
24+
"ProductName": fields.Str(required=True, load_from="ProductName"),
2525
"Value": fields.Str(required=True, load_from="Value"),
2626
}
2727

2828

29-
class ItemDetailSchema(schema.ResponseSchema):
30-
"""ItemDetail - 产品配置"""
29+
class ResourceExtendInfoSchema(schema.ResponseSchema):
30+
"""ResourceExtendInfo - 资源标识"""
3131

3232
fields = {
33-
"ProductName": fields.Str(required=True, load_from="ProductName"),
33+
"KeyId": fields.Str(required=True, load_from="KeyId"),
3434
"Value": fields.Str(required=True, load_from="Value"),
3535
}
3636

ucloud/services/ucdn/schemas/models.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
from ucloud.core.typesystem import schema, fields
44

55

6-
class AccessConfSchema(schema.ResponseSchema):
7-
"""AccessConf - 访问控制"""
8-
9-
fields = {
10-
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
11-
}
12-
13-
146
class CacheConfSchema(schema.ResponseSchema):
157
"""CacheConf - 缓存配置"""
168

@@ -29,6 +21,14 @@ class CacheConfSchema(schema.ResponseSchema):
2921
}
3022

3123

24+
class AccessConfSchema(schema.ResponseSchema):
25+
"""AccessConf - 访问控制"""
26+
27+
fields = {
28+
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
29+
}
30+
31+
3232
class DomainInfoSchema(schema.ResponseSchema):
3333
"""DomainInfo - 域名配置"""
3434

@@ -287,16 +287,6 @@ class ReferConfSchema(schema.ResponseSchema):
287287
}
288288

289289

290-
class AdvancedConfSchema(schema.ResponseSchema):
291-
"""AdvancedConf - 域名高级配置"""
292-
293-
fields = {
294-
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
295-
"HttpClientHeader": fields.List(fields.Str()),
296-
"HttpOriginHeader": fields.List(fields.Str()),
297-
}
298-
299-
300290
class OriginConfSchema(schema.ResponseSchema):
301291
"""OriginConf - 回源配置"""
302292

@@ -326,6 +316,16 @@ class OriginConfSchema(schema.ResponseSchema):
326316
}
327317

328318

319+
class AdvancedConfSchema(schema.ResponseSchema):
320+
"""AdvancedConf - 域名高级配置"""
321+
322+
fields = {
323+
"Http2Https": fields.Bool(required=False, load_from="Http2Https"),
324+
"HttpClientHeader": fields.List(fields.Str()),
325+
"HttpOriginHeader": fields.List(fields.Str()),
326+
}
327+
328+
329329
class CacheAllConfigSchema(schema.ResponseSchema):
330330
"""CacheAllConfig - 缓存相关的配置"""
331331

ucloud/services/uec/schemas/models.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@ class IpListSchema(schema.ResponseSchema):
7878
}
7979

8080

81-
class StorVolumeInfoSchema(schema.ResponseSchema):
82-
"""StorVolumeInfo - 容器组存储卷信息"""
83-
84-
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"),
89-
}
90-
91-
9281
class ImageListSchema(schema.ResponseSchema):
9382
"""ImageList - 容器组镜像密钥列表"""
9483

@@ -116,6 +105,17 @@ class DockerInfoSchema(schema.ResponseSchema):
116105
}
117106

118107

108+
class StorVolumeInfoSchema(schema.ResponseSchema):
109+
"""StorVolumeInfo - 容器组存储卷信息"""
110+
111+
fields = {
112+
"DiskSize": fields.Int(required=False, load_from="DiskSize"),
113+
"MountPoint": fields.Str(required=False, load_from="MountPoint"),
114+
"Name": fields.Str(required=False, load_from="Name"),
115+
"ResourceId": fields.Str(required=False, load_from="ResourceId"),
116+
}
117+
118+
119119
class HolderListSchema(schema.ResponseSchema):
120120
"""HolderList - 容器组信息"""
121121

ucloud/services/uhost/schemas/models.py

+25-25
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ class CollectionSchema(schema.ResponseSchema):
3030
}
3131

3232

33-
class FeatureModesSchema(schema.ResponseSchema):
34-
"""FeatureModes - 可以支持的模式类别"""
35-
36-
fields = {
37-
"MinimalCpuPlatform": fields.List(fields.Str()),
38-
"Name": fields.Str(required=False, load_from="Name"),
39-
"RelatedToImageFeature": fields.List(fields.Str()),
40-
}
41-
42-
4333
class DataDiskInfoSchema(schema.ResponseSchema):
4434
"""DataDiskInfo - 数据盘信息"""
4535

@@ -62,13 +52,13 @@ class BootDiskInfoSchema(schema.ResponseSchema):
6252
}
6353

6454

65-
class CpuPlatformsSchema(schema.ResponseSchema):
66-
"""CpuPlatforms - CPU平台信息"""
55+
class FeatureModesSchema(schema.ResponseSchema):
56+
"""FeatureModes - 可以支持的模式类别"""
6757

6858
fields = {
69-
"Amd": fields.List(fields.Str()),
70-
"Ampere": fields.List(fields.Str()),
71-
"Intel": fields.List(fields.Str()),
59+
"MinimalCpuPlatform": fields.List(fields.Str()),
60+
"Name": fields.Str(required=False, load_from="Name"),
61+
"RelatedToImageFeature": fields.List(fields.Str()),
7262
}
7363

7464

@@ -90,6 +80,26 @@ class MachineSizesSchema(schema.ResponseSchema):
9080
}
9181

9282

83+
class DisksSchema(schema.ResponseSchema):
84+
"""Disks - 磁盘信息"""
85+
86+
fields = {
87+
"BootDisk": fields.List(BootDiskInfoSchema()),
88+
"DataDisk": fields.List(DataDiskInfoSchema()),
89+
"Name": fields.Str(required=False, load_from="Name"),
90+
}
91+
92+
93+
class CpuPlatformsSchema(schema.ResponseSchema):
94+
"""CpuPlatforms - CPU平台信息"""
95+
96+
fields = {
97+
"Amd": fields.List(fields.Str()),
98+
"Ampere": fields.List(fields.Str()),
99+
"Intel": fields.List(fields.Str()),
100+
}
101+
102+
93103
class GraphicsMemorySchema(schema.ResponseSchema):
94104
"""GraphicsMemory - GPU的显存指标"""
95105

@@ -108,16 +118,6 @@ class FeaturesSchema(schema.ResponseSchema):
108118
}
109119

110120

111-
class DisksSchema(schema.ResponseSchema):
112-
"""Disks - 磁盘信息"""
113-
114-
fields = {
115-
"BootDisk": fields.List(BootDiskInfoSchema()),
116-
"DataDisk": fields.List(DataDiskInfoSchema()),
117-
"Name": fields.Str(required=False, load_from="Name"),
118-
}
119-
120-
121121
class AvailableInstanceTypesSchema(schema.ResponseSchema):
122122
"""AvailableInstanceTypes - https://ushare.ucloudadmin.com/pages/viewpage.action?pageId=104662646"""
123123

ucloud/services/uk8s/schemas/models.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
from ucloud.core.typesystem import schema, fields
44

55

6+
class IPSetSchema(schema.ResponseSchema):
7+
"""IPSet - 节点的IP信息"""
8+
9+
fields = {
10+
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
11+
"Default": fields.Str(required=False, load_from="Default"),
12+
"IP": fields.Str(required=False, load_from="IP"),
13+
"IPId": fields.Str(required=False, load_from="IPId"),
14+
"Type": fields.Str(required=False, load_from="Type"),
15+
}
16+
17+
618
class DiskSetSchema(schema.ResponseSchema):
719
"""DiskSet - 节点磁盘信息"""
820

@@ -20,18 +32,6 @@ class DiskSetSchema(schema.ResponseSchema):
2032
}
2133

2234

23-
class IPSetSchema(schema.ResponseSchema):
24-
"""IPSet - 节点的IP信息"""
25-
26-
fields = {
27-
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
28-
"Default": fields.Str(required=False, load_from="Default"),
29-
"IP": fields.Str(required=False, load_from="IP"),
30-
"IPId": fields.Str(required=False, load_from="IPId"),
31-
"Type": fields.Str(required=False, load_from="Type"),
32-
}
33-
34-
3535
class UhostInfoSchema(schema.ResponseSchema):
3636
"""UhostInfo - 机器信息"""
3737

0 commit comments

Comments
 (0)