Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
762fdd6
add model folder
yufeiminds Sep 23, 2019
bdd5712
add model folder
yufeiminds Sep 23, 2019
5a146a2
Merge pull request #4 from yufeiminds/faeture/auto-release
ucloud-bot Sep 23, 2019
7f234ab
update template
yufeiminds Sep 23, 2019
457e9ec
auto release by sdk team
ucloud-bot Sep 24, 2019
ce82fec
auto release by sdk team
ucloud-bot Sep 24, 2019
058ca31
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
c37c0ad
auto release by sdk team
ucloud-bot Sep 24, 2019
e83bf54
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
b2ad8c0
auto release by sdk team
ucloud-bot Sep 24, 2019
2730289
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
68ea031
auto release by sdk team
ucloud-bot Sep 24, 2019
be29814
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
402ef4f
auto release by sdk team
ucloud-bot Sep 24, 2019
21dae2c
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
7f07db6
auto release by sdk team
ucloud-bot Sep 24, 2019
2190021
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
7c722f4
auto release by sdk team
ucloud-bot Sep 24, 2019
3a243f5
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
901bc4b
auto release by sdk team
ucloud-bot Sep 24, 2019
6181982
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 24, 2019
511d797
fix version
ucloud-bot Sep 24, 2019
e80af02
auto release by sdk team
ucloud-bot Sep 25, 2019
f734b70
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
59b2ff7
auto release by sdk team
ucloud-bot Sep 25, 2019
bd1be88
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
f1a6e1f
auto release by sdk team
ucloud-bot Sep 25, 2019
2ff0433
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
f09fea2
auto release by sdk team
ucloud-bot Sep 25, 2019
0e66412
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 25, 2019
847b6b0
auto release by sdk team
ucloud-bot Sep 26, 2019
96785ca
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
703b1f2
fix version
ucloud-bot Sep 26, 2019
df6456e
auto release by sdk team
ucloud-bot Sep 26, 2019
247bfa2
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
641b23e
auto release by sdk team
ucloud-bot Sep 26, 2019
109cd4d
Merge branch 'auto-release' of https://github.com/ucloud-bot/ucloud-s…
ucloud-bot Sep 26, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions ucloud/services/ulb/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,24 @@ class PolicyBackendSetSchema(schema.ResponseSchema):
}


class ULBPolicySetSchema(schema.ResponseSchema):
""" ULBPolicySet - 内容转发详细列表
"""

fields = {
"BackendSet": fields.List(PolicyBackendSetSchema()),
"Match": fields.Str(required=False, load_from="Match"),
"PolicyId": fields.Str(required=False, load_from="PolicyId"),
"PolicyPriority": fields.Int(
required=False, load_from="PolicyPriority"
),
"PolicyType": fields.Str(required=False, load_from="PolicyType"),
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
"Type": fields.Str(required=False, load_from="Type"),
"VServerId": fields.Str(required=False, load_from="VServerId"),
}


class ULBBackendSetSchema(schema.ResponseSchema):
""" ULBBackendSet - DescribeULB
"""
Expand All @@ -62,21 +80,29 @@ class ULBBackendSetSchema(schema.ResponseSchema):
}


class ULBPolicySetSchema(schema.ResponseSchema):
""" ULBPolicySet - 内容转发详细列表
class ULBIPSetSchema(schema.ResponseSchema):
""" ULBIPSet - DescribeULB
"""

fields = {
"BackendSet": fields.List(PolicyBackendSetSchema()),
"Match": fields.Str(required=False, load_from="Match"),
"PolicyId": fields.Str(required=False, load_from="PolicyId"),
"PolicyPriority": fields.Int(
required=False, load_from="PolicyPriority"
),
"PolicyType": fields.Str(required=False, load_from="PolicyType"),
"TotalCount": fields.Int(required=False, load_from="TotalCount"),
"Type": fields.Str(required=False, load_from="Type"),
"VServerId": fields.Str(required=False, load_from="VServerId"),
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
"BandwidthType": fields.Int(required=False, load_from="BandwidthType"),
"EIP": fields.Str(required=False, load_from="EIP"),
"EIPId": fields.Str(required=False, load_from="EIPId"),
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
}


class ULBIPSetSchema(schema.ResponseSchema):
""" ULBIPSet - DescribeULB
"""

fields = {
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
"BandwidthType": fields.Int(required=False, load_from="BandwidthType"),
"EIP": fields.Str(required=False, load_from="EIP"),
"EIPId": fields.Str(required=False, load_from="EIPId"),
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
}


Expand Down
15 changes: 6 additions & 9 deletions ucloud/services/uphost/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,15 @@ class PHostCPUSetSchema(schema.ResponseSchema):
}


class PHostIPSetSchema(schema.ResponseSchema):
""" PHostIPSet - DescribePHost
class PHostCPUSetSchema(schema.ResponseSchema):
""" PHostCPUSet - DescribePHost
"""

fields = {
"Bandwidth": fields.Int(required=False, load_from="Bandwidth"),
"IPAddr": fields.Str(required=False, load_from="IPAddr"),
"IPId": fields.Str(required=False, load_from="IPId"),
"MACAddr": fields.Str(required=False, load_from="MACAddr"),
"OperatorName": fields.Str(required=False, load_from="OperatorName"),
"SubnetId": fields.Str(required=False, load_from="SubnetId"),
"VPCId": fields.Str(required=False, load_from="VPCId"),
"CoreCount": fields.Int(required=False, load_from="CoreCount"),
"Count": fields.Int(required=False, load_from="Count"),
"Frequence": fields.Float(required=False, load_from="Frequence"),
"Model": fields.Str(required=False, load_from="Model"),
}


Expand Down