opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正：1. 部分字段缺少create:"required|optional" tag导致该字段值未正确初始化

Browse Source 
2. climc option struct的json:"-" tag未正确处理
This commit is contained in:
Qiu Jian
2019-01-02 11:10:06 +08:00
parent 0e90e0225d
commit 2960a0557b
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+1 -1
View File
@@ -229,7 +229,7 @@ type SGuest struct {
SecgrpId string `width:"36" charset:"ascii" nullable:"true" get:"user" create:"optional"` // Column(VARCHAR(36, charset='ascii'), nullable=True)
AdminSecgrpId string `width:"36" charset:"ascii" nullable:"true" get:"admin"` // Column(VARCHAR(36, charset='ascii'), nullable=True)
Hypervisor string `width:"16" charset:"ascii" nullable:"false" default:"kvm" list:"user"` // Column(VARCHAR(16, charset='ascii'), nullable=False, default=HYPERVISOR_DEFAULT)
Hypervisor string `width:"16" charset:"ascii" nullable:"false" default:"kvm" list:"user" create:"required"` // Column(VARCHAR(16, charset='ascii'), nullable=False, default=HYPERVISOR_DEFAULT)
InstanceType string `width:"64" charset:"ascii" nullable:"true" list:"user" create:"optional"`
}
pkg/compute/models/loadbalanceracls.go
+1 -1
View File
@@ -103,7 +103,7 @@ type SLoadbalancerAcl struct {
db.SSharableVirtualResourceBase
SManagedResourceBase
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default" create:"required"`
AclEntries *SLoadbalancerAclEntries `list:"user" update:"user" create:"required"`
}
pkg/compute/models/loadbalancercertificates.go
+1 -1
View File
@@ -60,7 +60,7 @@ type SLoadbalancerCertificate struct {
CommonName string `create:"optional" list:"user" update:"user"`
SubjectAlternativeNames string `create:"optional" list:"user" update:"user"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default" create:"required"`
}
func (man *SLoadbalancerCertificateManager) PreDeleteSubs(ctx context.Context, userCred mcclient.TokenCredential, q *sqlchemy.SQuery) {
pkg/compute/models/loadbalancers.go
+1 -1
View File
@@ -55,7 +55,7 @@ type SLoadbalancer struct {
NetworkId string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"required"`
VpcId string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"optional"`
ZoneId string `width:"36" charset:"ascii" nullable:"false" list:"user" create:"optional"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default" create:"required"`
BackendGroupId string `width:"36" charset:"ascii" nullable:"false" list:"user" update:"user" update:"user"`
}
pkg/mcclient/options/base.go
+3
View File
@@ -56,6 +56,9 @@ func optionsStructRvToParams(rv reflect.Value) (*jsonutils.JSONDict, error) {
if name == "" {
continue
}
if jsonInfo.Ignore {
continue
}
f := rv.Field(i)
begin:
switch f.Kind() {