Skip to content

Commit 7402203

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.63 (#267)
1 parent 75de781 commit 7402203

File tree

7 files changed

+92
-82
lines changed

7 files changed

+92
-82
lines changed

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@ class BootDiskInfoSchema(schema.ResponseSchema):
6262
}
6363

6464

65+
class PerformanceSchema(schema.ResponseSchema):
66+
"""Performance - GPU的性能指标"""
67+
68+
fields = {
69+
"Rate": fields.Int(required=False, load_from="Rate"),
70+
"Value": fields.Float(required=False, load_from="Value"),
71+
}
72+
73+
6574
class MachineSizesSchema(schema.ResponseSchema):
6675
"""MachineSizes - GPU、CPU和内存信息"""
6776

@@ -109,15 +118,6 @@ class CpuPlatformsSchema(schema.ResponseSchema):
109118
}
110119

111120

112-
class PerformanceSchema(schema.ResponseSchema):
113-
"""Performance - GPU的性能指标"""
114-
115-
fields = {
116-
"Rate": fields.Int(required=False, load_from="Rate"),
117-
"Value": fields.Float(required=False, load_from="Value"),
118-
}
119-
120-
121121
class AvailableInstanceTypesSchema(schema.ResponseSchema):
122122
"""AvailableInstanceTypes - https://ushare.ucloudadmin.com/pages/viewpage.action?pageId=104662646"""
123123

@@ -189,19 +189,23 @@ class IsolationGroupSchema(schema.ResponseSchema):
189189
}
190190

191191

192-
class UHostDiskSetSchema(schema.ResponseSchema):
193-
"""UHostDiskSet - DescribeUHostInstance"""
192+
class UHostIPSetSchema(schema.ResponseSchema):
193+
"""UHostIPSet - DescribeUHostInstance"""
194194

195195
fields = {
196-
"BackupType": fields.Str(required=False, load_from="BackupType"),
197-
"DiskId": fields.Str(required=False, load_from="DiskId"),
198-
"DiskType": fields.Str(required=True, load_from="DiskType"),
199-
"Drive": fields.Str(required=False, load_from="Drive"),
200-
"Encrypted": fields.Str(required=False, load_from="Encrypted"),
201-
"IsBoot": fields.Str(required=True, load_from="IsBoot"),
202-
"Name": fields.Str(required=False, load_from="Name"),
203-
"Size": fields.Int(required=False, load_from="Size"),
196+
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
197+
"Default": fields.Str(required=False, load_from="Default"),
198+
"IP": fields.Str(required=False, load_from="IP"),
199+
"IPId": fields.Str(required=False, load_from="IPId"),
200+
"IPMode": fields.Str(required=True, load_from="IPMode"),
201+
"Mac": fields.Str(required=False, load_from="Mac"),
202+
"NetworkInterfaceId": fields.Str(
203+
required=False, load_from="NetworkInterfaceId"
204+
),
205+
"SubnetId": fields.Str(required=False, load_from="SubnetId"),
204206
"Type": fields.Str(required=False, load_from="Type"),
207+
"VPCId": fields.Str(required=False, load_from="VPCId"),
208+
"Weight": fields.Int(required=False, load_from="Weight"),
205209
}
206210

207211

@@ -214,13 +218,19 @@ class UHostKeyPairSchema(schema.ResponseSchema):
214218
}
215219

216220

217-
class UDSetUDHostAttributeSchema(schema.ResponseSchema):
218-
"""UDSetUDHostAttribute - 私有专区对应的宿主机属性"""
221+
class UHostDiskSetSchema(schema.ResponseSchema):
222+
"""UHostDiskSet - DescribeUHostInstance"""
219223

220224
fields = {
221-
"HostBinding": fields.Bool(required=False, load_from="HostBinding"),
222-
"UDHostId": fields.Str(required=False, load_from="UDHostId"),
223-
"UDSetId": fields.Str(required=False, load_from="UDSetId"),
225+
"BackupType": fields.Str(required=False, load_from="BackupType"),
226+
"DiskId": fields.Str(required=False, load_from="DiskId"),
227+
"DiskType": fields.Str(required=True, load_from="DiskType"),
228+
"Drive": fields.Str(required=False, load_from="Drive"),
229+
"Encrypted": fields.Str(required=False, load_from="Encrypted"),
230+
"IsBoot": fields.Str(required=True, load_from="IsBoot"),
231+
"Name": fields.Str(required=False, load_from="Name"),
232+
"Size": fields.Int(required=False, load_from="Size"),
233+
"Type": fields.Str(required=False, load_from="Type"),
224234
}
225235

226236

@@ -232,23 +242,13 @@ class SpotAttributeSchema(schema.ResponseSchema):
232242
}
233243

234244

235-
class UHostIPSetSchema(schema.ResponseSchema):
236-
"""UHostIPSet - DescribeUHostInstance"""
245+
class UDSetUDHostAttributeSchema(schema.ResponseSchema):
246+
"""UDSetUDHostAttribute - 私有专区对应的宿主机属性"""
237247

238248
fields = {
239-
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
240-
"Default": fields.Str(required=False, load_from="Default"),
241-
"IP": fields.Str(required=False, load_from="IP"),
242-
"IPId": fields.Str(required=False, load_from="IPId"),
243-
"IPMode": fields.Str(required=True, load_from="IPMode"),
244-
"Mac": fields.Str(required=False, load_from="Mac"),
245-
"NetworkInterfaceId": fields.Str(
246-
required=False, load_from="NetworkInterfaceId"
247-
),
248-
"SubnetId": fields.Str(required=False, load_from="SubnetId"),
249-
"Type": fields.Str(required=False, load_from="Type"),
250-
"VPCId": fields.Str(required=False, load_from="VPCId"),
251-
"Weight": fields.Int(required=False, load_from="Weight"),
249+
"HostBinding": fields.Bool(required=False, load_from="HostBinding"),
250+
"UDHostId": fields.Str(required=False, load_from="UDHostId"),
251+
"UDSetId": fields.Str(required=False, load_from="UDSetId"),
252252
}
253253

254254

‎ucloud/services/umem/client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,20 @@ def describe_umem_block_info(
656656
**Response**
657657
658658
- **DataSet** (list) - 见 **UMemBlockInfo** 模型定义
659+
- **ReadMode** (str) - 集群读写分离策略。 枚举值[ "Custom": 用户自定义节点权重， "Uniform": 包括主节点在内的所有节点平均读请求， "ReadOnly": 读请求均分至只读节点]
659660
660661
**Response Model**
661662
662663
**UMemBlockInfo**
663664
- **BlockId** (str) - 分片id
665+
- **BlockName** (str) - 分片名称
664666
- **BlockPort** (int) - 分片端口
667+
- **BlockReadWeight** (int) - 分片读权重
665668
- **BlockSize** (int) - 容量单位GB
666669
- **BlockSlotBegin** (int) - 分片维护的键槽起始值
667670
- **BlockSlotEnd** (int) - 分片维护的键槽结束值
668-
- **BlockState** (str) - 实例状态 Starting // 创建中 Creating // 初始化中 CreateFail // 创建失败 Fail // 创建失败 Deleting // 删除中 DeleteFail // 删除失败 Running // 运行 Resizing // 容量调整中 ResizeFail // 容量调整失败 Configing // 配置中 ConfigFail // 配置失败Restarting // 重启中 SetPasswordFail //设置密码失败
671+
- **BlockState** (str) - 实例状态 Starting // 创建中 Creating // 初始化中 CreateFail // 创建失败 Fail // 创建失败 Deleting // 删除中 DeleteFail // 删除失败 Running // 运行 Resizing // 容量调整中 ResizeFail // 容量调整失败 Configing // 配置中 ConfigFail // 配置失败Restarting // 重启中 SetPasswordFail //设置密码失败UpgradeMemInit //任务初始化
672+
- **BlockType** (str) - 分片类型，master 或者 slave
669673
- **BlockUsedSize** (int) - 使用量单位MB
670674
- **BlockVip** (str) - 分片ip
671675

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ class DescribeUMemBlockInfoResponseSchema(schema.ResponseSchema):
535535
"DataSet": fields.List(
536536
models.UMemBlockInfoSchema(), required=False, load_from="DataSet"
537537
),
538+
"ReadMode": fields.Str(required=False, load_from="ReadMode"),
538539
}
539540

540541

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,16 @@ class UMemBlockInfoSchema(schema.ResponseSchema):
117117

118118
fields = {
119119
"BlockId": fields.Str(required=True, load_from="BlockId"),
120+
"BlockName": fields.Str(required=False, load_from="BlockName"),
120121
"BlockPort": fields.Int(required=True, load_from="BlockPort"),
122+
"BlockReadWeight": fields.Int(
123+
required=False, load_from="BlockReadWeight"
124+
),
121125
"BlockSize": fields.Int(required=True, load_from="BlockSize"),
122126
"BlockSlotBegin": fields.Int(required=True, load_from="BlockSlotBegin"),
123127
"BlockSlotEnd": fields.Int(required=True, load_from="BlockSlotEnd"),
124128
"BlockState": fields.Str(required=True, load_from="BlockState"),
129+
"BlockType": fields.Str(required=False, load_from="BlockType"),
125130
"BlockUsedSize": fields.Int(required=False, load_from="BlockUsedSize"),
126131
"BlockVip": fields.Str(required=False, load_from="BlockVip"),
127132
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,22 @@ class UnetBandwidthUsageEIPSetSchema(schema.ResponseSchema):
5555
}
5656

5757

58+
class ShareBandwidthSetSchema(schema.ResponseSchema):
59+
"""ShareBandwidthSet - DescribeEIP"""
60+
61+
fields = {
62+
"ShareBandwidth": fields.Int(
63+
required=False, load_from="ShareBandwidth"
64+
),
65+
"ShareBandwidthId": fields.Str(
66+
required=False, load_from="ShareBandwidthId"
67+
),
68+
"ShareBandwidthName": fields.Str(
69+
required=False, load_from="ShareBandwidthName"
70+
),
71+
}
72+
73+
5874
class UnetEIPResourceSetSchema(schema.ResponseSchema):
5975
"""UnetEIPResourceSet - DescribeEIP"""
6076

@@ -86,22 +102,6 @@ class EIPBindingSchema(schema.ResponseSchema):
86102
}
87103

88104

89-
class ShareBandwidthSetSchema(schema.ResponseSchema):
90-
"""ShareBandwidthSet - DescribeEIP"""
91-
92-
fields = {
93-
"ShareBandwidth": fields.Int(
94-
required=False, load_from="ShareBandwidth"
95-
),
96-
"ShareBandwidthId": fields.Str(
97-
required=False, load_from="ShareBandwidthId"
98-
),
99-
"ShareBandwidthName": fields.Str(
100-
required=False, load_from="ShareBandwidthName"
101-
),
102-
}
103-
104-
105105
class UnetEIPSetSchema(schema.ResponseSchema):
106106
"""UnetEIPSet - DescribeEIP"""
107107

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,31 @@ class ReceiptPerSessionSchema(schema.ResponseSchema):
2626
}
2727

2828

29+
class StatisticsDataSchema(schema.ResponseSchema):
30+
"""StatisticsData - 统计信息"""
31+
32+
fields = {
33+
"FailCostCount": fields.Int(required=True, load_from="FailCostCount"),
34+
"FailCount": fields.Int(required=True, load_from="FailCount"),
35+
"SendCostCount": fields.Int(required=True, load_from="SendCostCount"),
36+
"SendCount": fields.Int(required=True, load_from="SendCount"),
37+
"SubmitFailCostCount": fields.Int(
38+
required=True, load_from="SubmitFailCostCount"
39+
),
40+
"SubmitFailCount": fields.Int(
41+
required=True, load_from="SubmitFailCount"
42+
),
43+
"SuccessCostCount": fields.Int(
44+
required=True, load_from="SuccessCostCount"
45+
),
46+
"SuccessCount": fields.Int(required=True, load_from="SuccessCount"),
47+
"UnknownCostCount": fields.Int(
48+
required=True, load_from="UnknownCostCount"
49+
),
50+
"UnknownCount": fields.Int(required=True, load_from="UnknownCount"),
51+
}
52+
53+
2954
class StatisticsDataInfoSchema(schema.ResponseSchema):
3055
"""StatisticsDataInfo - 统计信息按天聚合"""
3156

@@ -57,31 +82,6 @@ class StatisticsDataInfoSchema(schema.ResponseSchema):
5782
}
5883

5984

60-
class StatisticsDataSchema(schema.ResponseSchema):
61-
"""StatisticsData - 统计信息"""
62-
63-
fields = {
64-
"FailCostCount": fields.Int(required=True, load_from="FailCostCount"),
65-
"FailCount": fields.Int(required=True, load_from="FailCount"),
66-
"SendCostCount": fields.Int(required=True, load_from="SendCostCount"),
67-
"SendCount": fields.Int(required=True, load_from="SendCount"),
68-
"SubmitFailCostCount": fields.Int(
69-
required=True, load_from="SubmitFailCostCount"
70-
),
71-
"SubmitFailCount": fields.Int(
72-
required=True, load_from="SubmitFailCount"
73-
),
74-
"SuccessCostCount": fields.Int(
75-
required=True, load_from="SuccessCostCount"
76-
),
77-
"SuccessCount": fields.Int(required=True, load_from="SuccessCount"),
78-
"UnknownCostCount": fields.Int(
79-
required=True, load_from="UnknownCostCount"
80-
),
81-
"UnknownCount": fields.Int(required=True, load_from="UnknownCount"),
82-
}
83-
84-
8585
class OutSignatureSchema(schema.ResponseSchema):
8686
"""OutSignature - 短信签名"""
8787

‎ucloud/version.py

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

0 commit comments

Comments
 (0)