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

Merge pull request #860 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-lb-cloudregion-optional to release/2.5.0

Browse Source 
* commit 'ddbae418a61ef26748ec1954cc22741037d2d51e':
  compute: models: 改正default、required标签使用
  loadbalancers: cloudregion_id字段API兼容
This commit is contained in:
周有松
2018-12-29 20:19:33 +08:00
parent bb8d0b0a48 ddbae418a6
commit 793300f1cb
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+1 -1
View File
@@ -75,7 +75,7 @@ type SElasticip struct {
Bandwidth int `list:"user" create:"required"`
ChargeType string `list:"user" create:"required" default:"traffic"`
ChargeType string `list:"user" create:"required"`
AutoDellocate tristate.TriState `default:"false" get:"user" create:"optional"`
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" create:"required"` // Column(VARCHAR(16, charset='ascii'), nullable=False, default=HYPERVISOR_DEFAULT)
Hypervisor string `width:"16" charset:"ascii" nullable:"false" default:"kvm" list:"user"` // 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/keypairs.go
+5 -5
View File
@@ -35,11 +35,11 @@ func init() {
type SKeypair struct {
db.SStandaloneResourceBase
Scheme string `width:"12" charset:"ascii" nullable:"true" default:"RSA" list:"user" create:"required"` // Column(VARCHAR(length=12, charset='ascii'), nullable=True, default='RSA')
Fingerprint string `width:"48" charset:"ascii" nullable:"false" list:"user" create:"required"` // Column(VARCHAR(length=48, charset='ascii'), nullable=False)
PrivateKey string `width:"2048" charset:"ascii" nullable:"false" create:"optional"` // Column(VARCHAR(length=2048, charset='ascii'), nullable=False)
PublicKey string `width:"1024" charset:"ascii" nullable:"false" list:"user" create:"required"` // Column(VARCHAR(length=1024, charset='ascii'), nullable=False)
OwnerId string `width:"128" charset:"ascii" index:"true" nullable:"false" create:"required"` // Column(VARCHAR(length=36, charset='ascii'), index=True, nullable=False)
Scheme string `width:"12" charset:"ascii" nullable:"true" list:"user" create:"required"` // Column(VARCHAR(length=12, charset='ascii'), nullable=True, default='RSA')
Fingerprint string `width:"48" charset:"ascii" nullable:"false" list:"user" create:"required"` // Column(VARCHAR(length=48, charset='ascii'), nullable=False)
PrivateKey string `width:"2048" charset:"ascii" nullable:"false" create:"optional"` // Column(VARCHAR(length=2048, charset='ascii'), nullable=False)
PublicKey string `width:"1024" charset:"ascii" nullable:"false" list:"user" create:"required"` // Column(VARCHAR(length=1024, charset='ascii'), nullable=False)
OwnerId string `width:"128" charset:"ascii" index:"true" nullable:"false" create:"required"` // Column(VARCHAR(length=36, charset='ascii'), index=True, nullable=False)
}
func (manager *SKeypairManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) {
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" create:"required"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
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" create:"required"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
}
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" create:"required"`
CloudregionId string `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default"`
BackendGroupId string `width:"36" charset:"ascii" nullable:"false" list:"user" update:"user" update:"user"`
}