From 2960a0557b54a568281bb59f3a279ca255956af4 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Wed, 2 Jan 2019 11:10:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A1.=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=B0=91create:"required|o?=
 =?UTF-8?q?ptional"=20tag=E5=AF=BC=E8=87=B4=E8=AF=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=80=BC=E6=9C=AA=E6=AD=A3=E7=A1=AE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=202.=20climc=20option=20struct=E7=9A=84json:"-"=20tag=E6=9C=AA?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/compute/models/guests.go                   | 2 +-
 pkg/compute/models/loadbalanceracls.go         | 2 +-
 pkg/compute/models/loadbalancercertificates.go | 2 +-
 pkg/compute/models/loadbalancers.go            | 2 +-
 pkg/mcclient/options/base.go                   | 3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go
index c1ea6aacf0..ddc033e321 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"` // 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"`
 }
diff --git a/pkg/compute/models/loadbalanceracls.go b/pkg/compute/models/loadbalanceracls.go
index 577357fa33..be68701e22 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"`
+	CloudregionId string                   `width:"36" charset:"ascii" nullable:"false" list:"admin" default:"default" create:"required"`
 	AclEntries    *SLoadbalancerAclEntries `list:"user" update:"user" create:"required"`
 }
 
diff --git a/pkg/compute/models/loadbalancercertificates.go b/pkg/compute/models/loadbalancercertificates.go
index f85ac1d44e..ac7e623549 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"`
+	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) {
diff --git a/pkg/compute/models/loadbalancers.go b/pkg/compute/models/loadbalancers.go
index 02a4f55650..52b5a9c319 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" 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"`
 }
diff --git a/pkg/mcclient/options/base.go b/pkg/mcclient/options/base.go
index d433d11165..e8a6d12c09 100644
--- a/pkg/mcclient/options/base.go
+++ b/pkg/mcclient/options/base.go
@@ -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() {