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

fix: isValidNetworkInfo return httperrors, should not be wrapped as a

Browse Source 
httperror again
This commit is contained in:
Qiu Jian
2019-02-21 12:20:43 +08:00
parent 2a3f9596ba
commit 32299a1465
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+5 -3
View File
@@ -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) {