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

Merge pull request #18638 from wanyaoqi/automated-cherry-pick-of-#18636-upstream-master

Browse Source 
Automated cherry pick of #18636: fix(region): change config check traffic limit params
This commit is contained in:
Zexi Li
2023-11-13 11:38:53 +08:00
committed by GitHub
parent 42d64e8562 dc2a1a8279
commit b0c80ca22f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+6 -2
View File
@@ -2766,7 +2766,9 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
return nil, errors.Wrap(err, "get guest network by mac")
}
}
confs.Set("reset_traffic_limits", jsonutils.Marshal(input.ResetTrafficLimits))
if len(input.ResetTrafficLimits) > 0 {
confs.Set("reset_traffic_limits", jsonutils.Marshal(input.ResetTrafficLimits))
}
for i := range input.SetTrafficLimits {
input.SetTrafficLimits[i].Mac = strings.ToLower(input.SetTrafficLimits[i].Mac)
@@ -2775,7 +2777,9 @@ func (self *SGuest) PerformChangeConfig(ctx context.Context, userCred mcclient.T
return nil, errors.Wrap(err, "get guest network by mac")
}
}
confs.Set("set_traffic_limits", jsonutils.Marshal(input.SetTrafficLimits))
if len(input.SetTrafficLimits) > 0 {
confs.Set("set_traffic_limits", jsonutils.Marshal(input.SetTrafficLimits))
}
if addCpu < 0 {
addCpu = 0