From 32299a14652098d1ab3105779a866e08e66eb17c Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 21 Feb 2019 12:20:43 +0800 Subject: [PATCH] fix: isValidNetworkInfo return httperrors, should not be wrapped as a httperror again --- pkg/compute/models/guest_actions.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index b47c8ef624..47c07ecf33 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -1366,15 +1366,17 @@ func (self *SGuest) PerformChangeIpaddr(ctx context.Context, userCred mcclient.T netDesc, err := data.Get("net_desc") if err != nil { - return nil, httperrors.NewBadRequestError(err.Error()) + log.Errorf("net_desc not found") + return nil, httperrors.NewInputParameterError("missing net_desc") } conf, err := parseNetworkInfo(userCred, netDesc) if err != nil { + log.Errorf("parseNetworkInfo fail %s", err) return nil, err } err = isValidNetworkInfo(userCred, conf) if err != nil { - return nil, httperrors.NewBadRequestError(err.Error()) + return nil, err } host := self.GetHost() @@ -1492,7 +1494,7 @@ func (self *SGuest) PerformAttachnetwork(ctx context.Context, userCred mcclient. } err = isValidNetworkInfo(userCred, conf) if err != nil { - return nil, httperrors.NewBadRequestError(err.Error()) + return nil, err } var inicCnt, enicCnt, ibw, ebw int if isExitNetworkInfo(conf) {