From 60eb3bcbb27f21b8a01076f35b01e1e5adb40d9f Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Fri, 10 Jan 2020 13:56:32 +0800
Subject: [PATCH] validators: remove unused defaultVal member

---
 pkg/cloudcommon/validators/validators.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/cloudcommon/validators/validators.go b/pkg/cloudcommon/validators/validators.go
index 376b301218..d3c997675f 100644
--- a/pkg/cloudcommon/validators/validators.go
+++ b/pkg/cloudcommon/validators/validators.go
@@ -160,9 +160,8 @@ func (v *ValidatorIPv4Prefix) Validate(data *jsonutils.JSONDict) error {
 
 type ValidatorStringChoices struct {
 	Validator
-	Choices    choices.Choices
-	defaultVal string
-	Value      string
+	Choices choices.Choices
+	Value   string
 }
 
 func NewStringChoicesValidator(key string, choices choices.Choices) *ValidatorStringChoices {
@@ -176,7 +175,8 @@ func NewStringChoicesValidator(key string, choices choices.Choices) *ValidatorSt
 
 func (v *ValidatorStringChoices) Default(s string) IValidator {
 	if v.Choices.Has(s) {
-		return v.Validator.Default(s)
+		v.Validator.Default(s)
+		return v
 	}
 	panic("invalid default for " + v.Key)
 }
@@ -204,11 +204,10 @@ func (v *ValidatorStringChoices) Validate(data *jsonutils.JSONDict) error {
 
 type ValidatorStringMultiChoices struct {
 	Validator
-	Choices    choices.Choices
-	defaultVal string
-	Value      string
-	sep        string
-	keepDup    bool
+	Choices choices.Choices
+	Value   string
+	sep     string
+	keepDup bool
 }
 
 func NewStringMultiChoicesValidator(key string, choices choices.Choices) *ValidatorStringMultiChoices {