From 86ad0c6fabf83ec061d9d220ab74213657d24f95 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 29 Dec 2018 09:05:42 +0000 Subject: [PATCH 1/2] =?UTF-8?q?loadbalancers:=20cloudregion=5Fid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5API=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/loadbalanceracls.go | 2 +- pkg/compute/models/loadbalancercertificates.go | 2 +- pkg/compute/models/loadbalancers.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/loadbalanceracls.go b/pkg/compute/models/loadbalanceracls.go index be68701e22..577357fa33 100644 --- a/pkg/compute/models/loadbalanceracls.go +++ b/pkg/compute/models/loadbalanceracls.go @@ -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"` } diff --git a/pkg/compute/models/loadbalancercertificates.go b/pkg/compute/models/loadbalancercertificates.go index ac7e623549..f85ac1d44e 100644 --- a/pkg/compute/models/loadbalancercertificates.go +++ b/pkg/compute/models/loadbalancercertificates.go @@ -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) { diff --git a/pkg/compute/models/loadbalancers.go b/pkg/compute/models/loadbalancers.go index a42dab7616..d7ded1e74b 100644 --- a/pkg/compute/models/loadbalancers.go +++ b/pkg/compute/models/loadbalancers.go @@ -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"` } From ddbae418a61ef26748ec1954cc22741037d2d51e Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 29 Dec 2018 09:38:08 +0000 Subject: [PATCH 2/2] =?UTF-8?q?compute:=20models:=20=E6=94=B9=E6=AD=A3defa?= =?UTF-8?q?ult=E3=80=81required=E6=A0=87=E7=AD=BE=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/elasticips.go | 2 +- pkg/compute/models/guests.go | 2 +- pkg/compute/models/keypairs.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index afda303980..70e2c2d22a 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -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"` diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index cfd0a33ad2..99cfb8ae58 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -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"` } diff --git a/pkg/compute/models/keypairs.go b/pkg/compute/models/keypairs.go index 5120e02423..71a9aa2dda 100644 --- a/pkg/compute/models/keypairs.go +++ b/pkg/compute/models/keypairs.go @@ -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) {